diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-09-28 15:53:19 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-28 15:54:44 -0700 |
| commit | 3ff8e1a80058e5557d13693d3223e1aa011c0038 (patch) | |
| tree | 62d3c43fa2261c2aec17b76f08b7c8cc784c81fc /core/res/AndroidManifest.xml | |
| parent | 1d3527354396d3aa48b494fb409d680cce32dc8b (diff) | |
| parent | d4ac8d7b3de27a9f0e4c6af2496ca71d794e42d1 (diff) | |
| download | frameworks_base-3ff8e1a80058e5557d13693d3223e1aa011c0038.zip frameworks_base-3ff8e1a80058e5557d13693d3223e1aa011c0038.tar.gz frameworks_base-3ff8e1a80058e5557d13693d3223e1aa011c0038.tar.bz2 | |
Merge "Fix issue #7211769 and #7244492, thrash around on #7226656." into jb-mr1-dev
Diffstat (limited to 'core/res/AndroidManifest.xml')
| -rw-r--r-- | core/res/AndroidManifest.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index a16f2ae..9801d98 100644 --- a/core/res/AndroidManifest.xml +++ b/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> |