fixes manifest, add getEngine()

Author: codeanticode

core/src/processing/core/PApplet.java

@@ -41,11 +41,11 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.service.wallpaper.WallpaperService;
 import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.SurfaceHolder;
-import android.view.SurfaceView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
@@ -446,6 +446,11 @@ public Activity getActivity() {
   }
 
 
+  public WallpaperService.Engine getEngine() {
+    return surface.getEngine();
+  }
+
+
   public void initSurface(AppComponent component, SurfaceHolder holder) {
     parentLayout = -1;
     initSurface(null, null,  null, component, holder);

src/processing/mode/android/Manifest.java

@@ -156,38 +156,39 @@ public void setPermissions(String[] names) {
     for (XML kid : xml.getChildren("uses-permission")) {
       String name = kid.getString("android:name");
       // Don't remove required permissions for wallpapers, watchfaces and cardboard.      
+      if (-1 < name.indexOf(".")) continue;
       if (appComp == AndroidBuild.WALLPAPER) {
       } else if (appComp == AndroidBuild.WATCHFACE) {
-        if (name.equals("android.permission.WAKE_LOCK")) continue;
+        if (name.equals("WAKE_LOCK")) continue;
       } else if (appComp == AndroidBuild.CARDBOARD) {
-        if (name.equals("android.permission.INTERNET") ||
-            name.equals("android.permission.NFC") ||
-            name.equals("android.permission.VIBRATE") ||
-            name.equals("android.permission.READ_EXTERNAL_STORAGE") ||
-            name.equals("android.permission.WRITE_EXTERNAL_STORAGE")) continue;
-      }      
+        if (name.equals("INTERNET") ||
+            name.equals("NFC") ||
+            name.equals("VIBRATE") ||
+            name.equals("READ_EXTERNAL_STORAGE") ||
+            name.equals("WRITE_EXTERNAL_STORAGE")) continue;
+      }
       xml.removeChild(kid);
     }
     // ...and add the new kids back
     for (String name : names) {
       // Don't add required permissions for wallpapers, watchfaces and cardboard again.      
       if (appComp == AndroidBuild.WALLPAPER) {
       } else if (appComp == AndroidBuild.WATCHFACE) {
-        if (name.equals("android.permission.WAKE_LOCK")) continue;
+        if (name.equals("WAKE_LOCK")) continue;
       } else if (appComp == AndroidBuild.CARDBOARD) {
-        if (name.equals("android.permission.INTERNET") ||
-            name.equals("android.permission.NFC") ||
-            name.equals("android.permission.VIBRATE") ||
-            name.equals("android.permission.READ_EXTERNAL_STORAGE") ||
-            name.equals("android.permission.WRITE_EXTERNAL_STORAGE")) continue;
+        if (name.equals("INTERNET") ||
+            name.equals("NFC") ||
+            name.equals("VIBRATE") ||
+            name.equals("READ_EXTERNAL_STORAGE") ||
+            name.equals("WRITE_EXTERNAL_STORAGE")) continue;
       }       
       XML newbie = xml.addChild("uses-permission");
       if (-1 < name.indexOf(".")) {
         // Permission string contains path
         newbie.setString("android:name", name);
       } else {
         newbie.setString("android:name", PERMISSION_PREFIX + name);
-      }      
+      }
     }
     save();
   }