Merge "Fix issue #7211769 and #7244492, thrash around on #7226656." into jb-mr1-dev

Author: Dianne Hackborn

cmds/am/src/com/android/commands/am/Am.java

@@ -127,6 +127,8 @@ private void run(String[] args) throws Exception {
             runSetDebugApp();
         } else if (op.equals("clear-debug-app")) {
             runClearDebugApp();
+        } else if (op.equals("bug-report")) {
+            runBugReport();
         } else if (op.equals("monitor")) {
             runMonitor();
         } else if (op.equals("screen-compat")) {
@@ -844,6 +846,11 @@ private void runClearDebugApp() throws Exception {
         mAm.setDebugApp(null, false, true);
     }
 
+    private void runBugReport() throws Exception {
+        mAm.requestBugReport();
+        System.out.println("Your lovely bug report is being created; please be patient.");
+    }
+
     private void runSwitchUser() throws Exception {
         String user = nextArgRequired();
         mAm.switchUser(Integer.parseInt(user));
@@ -1508,6 +1515,9 @@ private static void showUsage() {
                 "\n" +
                 "am clear-debug-app: clear the previously set-debug-app.\n" +
                 "\n" +
+                "am bug-report: request bug report generation; will launch UI\n" +
+                "    when done to select where it should be delivered." +
+                "\n" +
                 "am monitor: start monitoring for crashes or ANRs.\n" +
                 "    --gdb: start gdbserv on the given port at crash/ANR\n" +
                 "\n" +

core/java/android/app/ActivityManagerNative.java

@@ -1783,6 +1783,12 @@ public boolean onTransact(int code, Parcel data, Parcel reply, int flags)
             return true;
         }
 
+        case REQUEST_BUG_REPORT_TRANSACTION: {
+            data.enforceInterface(IActivityManager.descriptor);
+            requestBugReport();
+            return true;
+        }
+
         }
 
         return super.onTransact(code, data, reply, flags);
@@ -4066,5 +4072,15 @@ public void unregisterUserSwitchObserver(IUserSwitchObserver observer) throws Re
         reply.recycle();
     }
 
+    public void requestBugReport() throws RemoteException {
+        Parcel data = Parcel.obtain();
+        Parcel reply = Parcel.obtain();
+        data.writeInterfaceToken(IActivityManager.descriptor);
+        mRemote.transact(REQUEST_BUG_REPORT_TRANSACTION, data, reply, 0);
+        reply.readException();
+        data.recycle();
+        reply.recycle();
+    }
+
     private IBinder mRemote;
 }

core/java/android/app/IActivityManager.java

@@ -361,6 +361,8 @@ public boolean navigateUpTo(IBinder token, Intent target, int resultCode, Intent
     public void registerUserSwitchObserver(IUserSwitchObserver observer) throws RemoteException;
     public void unregisterUserSwitchObserver(IUserSwitchObserver observer) throws RemoteException;
 
+    public void requestBugReport() throws RemoteException;
+
     /*
      * Private non-Binder interfaces
      */
@@ -613,4 +615,5 @@ private WaitResult(Parcel source) {
     int REGISTER_USER_SWITCH_OBSERVER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+154;
     int UNREGISTER_USER_SWITCH_OBSERVER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+155;
     int GET_RUNNING_USER_IDS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+156;
+    int REQUEST_BUG_REPORT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+157;
 }

core/java/android/content/pm/ActivityInfo.java

@@ -171,11 +171,17 @@ public class ActivityInfo extends ComponentInfo
      * {@see android.app.Notification#FLAG_HIGH_PRIORITY}
      */
     public static final int FLAG_IMMERSIVE = 0x0400;
+    /**
+     * @hide Bit in {@link #flags}: If set, this component will only be seen
+     * by the primary user.  Only works with broadcast receivers.  Set from the
+     * {@link android.R.attr#primaryUserOnly} attribute.
+     */
+    public static final int FLAG_PRIMARY_USER_ONLY = 0x20000000;
     /**
      * Bit in {@link #flags}: If set, a single instance of the receiver will
      * run for all users on the device.  Set from the
      * {@link android.R.attr#singleUser} attribute.  Note that this flag is
-     * only relevent for ActivityInfo structures that are describiner receiver
+     * only relevant for ActivityInfo structures that are describing receiver
      * components; it is not applied to activities.
      */
     public static final int FLAG_SINGLE_USER = 0x40000000;

core/java/android/content/pm/PackageParser.java

@@ -2193,7 +2193,7 @@ private Activity parseActivity(Package owner, Resources res,
             if (sa.getBoolean(
                     com.android.internal.R.styleable.AndroidManifestActivity_singleUser,
                     false)) {
-                a.info.flags |= ServiceInfo.FLAG_SINGLE_USER;
+                a.info.flags |= ActivityInfo.FLAG_SINGLE_USER;
                 if (a.info.exported) {
                     Slog.w(TAG, "Activity exported request ignored due to singleUser: "
                             + a.className + " at " + mArchiveSourcePath + " "
@@ -2202,6 +2202,11 @@ private Activity parseActivity(Package owner, Resources res,
                 }
                 setExported = true;
             }
+            if (sa.getBoolean(
+                    com.android.internal.R.styleable.AndroidManifestActivity_primaryUserOnly,
+                    false)) {
+                a.info.flags |= ActivityInfo.FLAG_PRIMARY_USER_ONLY;
+            }
         }
 
         sa.recycle();

core/java/android/content/pm/PackageUserState.java

@@ -34,6 +34,14 @@ public class PackageUserState {
     public HashSet<String> enabledComponents;
 
     public PackageUserState() {
+        this(true);
+    }
+
+    /** @hide */
+    public PackageUserState(boolean isSystem) {
+        if (!isSystem) {
+            stopped = notLaunched = true;
+        }
         installed = true;
         enabled = COMPONENT_ENABLED_STATE_DEFAULT;
     }

core/java/android/content/pm/UserInfo.java

@@ -71,6 +71,9 @@ public class UserInfo implements Parcelable {
     public long creationTime;
     public long lastLoggedInTime;
 
+    /** User is only partially created. */
+    public boolean partial;
+
     public UserInfo(int id, String name, int flags) {
         this(id, name, null, flags);
     }
@@ -105,6 +108,7 @@ public UserInfo(UserInfo orig) {
         serialNumber = orig.serialNumber;
         creationTime = orig.creationTime;
         lastLoggedInTime = orig.lastLoggedInTime;
+        partial = orig.partial;
     }
 
     public UserHandle getUserHandle() {
@@ -128,6 +132,7 @@ public void writeToParcel(Parcel dest, int parcelableFlags) {
         dest.writeInt(serialNumber);
         dest.writeLong(creationTime);
         dest.writeLong(lastLoggedInTime);
+        dest.writeInt(partial ? 1 : 0);
     }
 
     public static final Parcelable.Creator<UserInfo> CREATOR
@@ -148,5 +153,6 @@ private UserInfo(Parcel source) {
         serialNumber = source.readInt();
         creationTime = source.readLong();
         lastLoggedInTime = source.readLong();
+        partial = source.readInt() != 0;
     }
 }

core/res/AndroidManifest.xml

@@ -2140,7 +2140,8 @@
                 android:process=":ui">
         </activity>
 
-        <receiver android:name="com.android.server.BootReceiver" >
+        <receiver android:name="com.android.server.BootReceiver"
+                android:primaryUserOnly="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>

core/res/res/values/attrs_manifest.xml

@@ -1391,6 +1391,9 @@
         <attr name="uiOptions" />
         <attr name="parentActivityName" />
         <attr name="singleUser" />
+        <!-- @hide This broacast receiver will only receive broadcasts for the
+             primary user.  Can only be used with receivers. -->
+        <attr name="primaryUserOnly" format="boolean" />
     </declare-styleable>
 
     <!-- The <code>activity-alias</code> tag declares a new

packages/SystemUI/AndroidManifest.xml

@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
         package="com.android.systemui"
         coreApp="true">
 
@@ -91,7 +92,7 @@
                 android:permission="android.permission.BIND_WALLPAPER"
                 android:exported="true" />
 
-        <receiver android:name=".BootReceiver" >
+        <receiver android:name=".BootReceiver" androidprv:primaryUserOnly="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>