OSDN Git Service
Mike Tsao [Tue, 18 Apr 2017 00:03:01 +0000 (00:03 +0000)]
Merge "Cleanup that wasn't uploaded with ag/
2094132" into oc-dev
am:
3244faae29
Change-Id: Ia494631b64d9cd670ac0045e2e8e9e9a5fa52bcc
Winson Chung [Tue, 18 Apr 2017 00:01:44 +0000 (00:01 +0000)]
Merge "Tightening up rotation behavior for PIP (3/3)" into oc-dev
am:
c2627353c4
Change-Id: I867999bac435926e9f54fb33e489ea3f44d1dad0
TreeHugger Robot [Mon, 17 Apr 2017 23:53:49 +0000 (23:53 +0000)]
Merge "Cleanup that wasn't uploaded with ag/
2094132" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 23:50:22 +0000 (23:50 +0000)]
Merge "Tightening up rotation behavior for PIP (3/3)" into oc-dev
Adrian Roos [Mon, 17 Apr 2017 23:49:08 +0000 (23:49 +0000)]
Merge "AppErrors: Add test for AppErrorDialog.onCreate" into oc-dev
am:
d7852f4363
Change-Id: Ic2587aa8da9d671b21c7292cd286dea011fd2503
TreeHugger Robot [Mon, 17 Apr 2017 23:41:33 +0000 (23:41 +0000)]
Merge "AppErrors: Add test for AppErrorDialog.onCreate" into oc-dev
Yifan Hong [Mon, 17 Apr 2017 23:34:32 +0000 (23:34 +0000)]
Merge changes from topic 'vintf_check_compat_native' am:
6d033475b3 am:
4fccec4f81
am:
ee93d9da20
Change-Id: Ic87e260af781cccd8af1c04cc95419c42484ca90
jiabin [Mon, 17 Apr 2017 23:30:01 +0000 (23:30 +0000)]
Merge "TIF: Add preview parameter to filter only preview or non-preview channels." into oc-dev
am:
4fba6e62a1
Change-Id: I1734b0d1e3a4f02bc19120e68c161decdef24081
TreeHugger Robot [Mon, 17 Apr 2017 23:25:20 +0000 (23:25 +0000)]
Merge "TIF: Add preview parameter to filter only preview or non-preview channels." into oc-dev
Julia Reynolds [Mon, 17 Apr 2017 23:24:43 +0000 (23:24 +0000)]
Merge "Notification settings can contain dashboard settings" into oc-dev
am:
38323f50c7
Change-Id: Id08a627ea7baf128667ad861481bc6d9c712929f
TreeHugger Robot [Mon, 17 Apr 2017 23:16:31 +0000 (23:16 +0000)]
Merge "Notification settings can contain dashboard settings" into oc-dev
Chris Craik [Mon, 17 Apr 2017 23:16:22 +0000 (23:16 +0000)]
Merge "Disable crashing drop shadow tests" into oc-dev
am:
9d67b50308
Change-Id: I4092a41511abcc8652bd4e482ee8c81738c1e009
Geoffrey Pitsch [Mon, 17 Apr 2017 23:15:01 +0000 (23:15 +0000)]
Merge "Accessibility for Notification Inline Controls" into oc-dev
am:
8c3a371bf3
Change-Id: I301f09565598eb80cddf107094a7fb3cd8c0b81b
TreeHugger Robot [Mon, 17 Apr 2017 23:11:09 +0000 (23:11 +0000)]
Merge "Disable crashing drop shadow tests" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 23:07:49 +0000 (23:07 +0000)]
Merge "Accessibility for Notification Inline Controls" into oc-dev
Geoffrey Pitsch [Mon, 17 Apr 2017 23:05:32 +0000 (23:05 +0000)]
Merge "Warning if app targeting O posts a notification with no channel" into oc-dev
am:
dc2dd6ed9b
Change-Id: I079da56d40214d3c5807e7f2165ab0c97d4c397d
Geoffrey Pitsch [Mon, 17 Apr 2017 22:59:01 +0000 (22:59 +0000)]
Merge "Warning if app targeting O posts a notification with no channel" into oc-dev
Jason Monk [Mon, 17 Apr 2017 22:50:33 +0000 (22:50 +0000)]
Merge "Fix up color issues as a result of theme change" into oc-dev
am:
8604ac3af5
Change-Id: Id3ac0f5131c9680d38c9d4b83904a47626785bea
Jason Monk [Mon, 17 Apr 2017 22:49:05 +0000 (22:49 +0000)]
Merge "Status bar updates" into oc-dev
am:
c5e04dbfd4
Change-Id: I34324fbaddc90814bc4efdd2d723c4b7264d284a
Jeff Sharkey [Mon, 17 Apr 2017 22:39:20 +0000 (22:39 +0000)]
Merge "Storage API polishing." into oc-dev
am:
200d72d933
Change-Id: I1ad134599ee095628dcc7fe1da28bda40a1863f4
Jason Monk [Mon, 17 Apr 2017 22:32:49 +0000 (22:32 +0000)]
Merge "Fix up color issues as a result of theme change" into oc-dev
Jason Monk [Mon, 17 Apr 2017 22:32:09 +0000 (22:32 +0000)]
Merge "Status bar updates" into oc-dev
Adrian Roos [Mon, 17 Apr 2017 22:27:47 +0000 (22:27 +0000)]
Merge "AOD: Track missed AOD time ticks" into oc-dev
am:
e7b581bca9
Change-Id: I72825244a16f4d88e8acd1e69e045859ef3a8acc
Jeff Sharkey [Mon, 17 Apr 2017 22:26:35 +0000 (22:26 +0000)]
Merge "Storage API polishing." into oc-dev
Jason Monk [Mon, 17 Apr 2017 22:26:20 +0000 (22:26 +0000)]
Merge "Fix date going missing in QS" into oc-dev
am:
ff9a2790b7
Change-Id: I88a31aad238ec5ca67b816cb6deb4e5f311536e1
TreeHugger Robot [Mon, 17 Apr 2017 22:16:16 +0000 (22:16 +0000)]
Merge "AOD: Track missed AOD time ticks" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 22:06:05 +0000 (22:06 +0000)]
Merge "Fix date going missing in QS" into oc-dev
Jesse Hall [Mon, 17 Apr 2017 21:55:21 +0000 (21:55 +0000)]
Merge "Include vndk/hardware_buffer.h for AHardwareBuffer_getNativeHandle" into oc-dev
am:
16338a4450
Change-Id: I1a9ee4e54834e340eef6216e55bae7c6aaba0f73
Adrian Roos [Mon, 17 Apr 2017 21:50:22 +0000 (14:50 -0700)]
AppErrors: Add test for AppErrorDialog.onCreate
Also refactor to make sure we always remove the TIMEOUT
message and clear the mProc.mCrashDialog field, even when
dismissing without the Handler.
Bug:
37351370
Test: runtest -c com.android.server.am.AppErrorDialogTest frameworks-services
Change-Id: If9fb348e8ed83c6c1c0f48fa7fd27ffd33b530f2
Jesse Hall [Mon, 17 Apr 2017 21:52:20 +0000 (21:52 +0000)]
Merge "Include vndk/hardware_buffer.h for AHardwareBuffer_getNativeHandle" into oc-dev
Mike Tsao [Mon, 17 Apr 2017 21:52:02 +0000 (21:52 +0000)]
Merge "Add tests for ag/
2086796" into oc-dev
am:
7c31e7924c
Change-Id: Ibe9266f7aa1f378a9e1868c927e3f28e2e2cb090
Winson Chung [Tue, 11 Apr 2017 20:31:44 +0000 (13:31 -0700)]
Tightening up rotation behavior for PIP (3/3)
- Fixing up edge case when SysUI resizing conflicts with updating the
display rotation bounds. When an interaction causes both a display
rotation and a resize from SystemUI, we should defer the resize animation
until the rotation has been propagated to SystemUI, otherwise the bounds
used will be incorrect.
Bug:
36879891
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: Ife1b7ab0c2f1f11f33cbc9614778ff49a28c79f6
Mike Tsao [Thu, 13 Apr 2017 23:19:28 +0000 (16:19 -0700)]
Cleanup that wasn't uploaded with ag/
2094132
I saw that Tree Hugger had verified, and hit submit without
remembering to repo upload the last patch set containing toddke's
most recent set of suggestions.
Bug:
37192695
Test: runtest -c com.android.server.pm.PackageManagerServiceTest frameworks-services
Change-Id: I4d6376165aaa615007891ba045c9b5c34e4b0394
(cherry picked from commit
338d332873c431c46057eae3c93ed79351ddd2e4)
Mike Tsao [Mon, 17 Apr 2017 21:46:32 +0000 (21:46 +0000)]
Merge "Add tests for ag/
2086796" into oc-dev
Julia Reynolds [Mon, 17 Apr 2017 21:40:09 +0000 (21:40 +0000)]
Merge "Add user to channel/group modification callbacks." into oc-dev
am:
1ed2771450
Change-Id: I3ff8b4f15fe7b3d22ef243e3f5379dd3d136a0f7
Julia Reynolds [Mon, 17 Apr 2017 21:24:07 +0000 (17:24 -0400)]
Notification settings can contain dashboard settings
Bug:
36562211
Test: NotificationSettingsTests, RunSettingsRoboTests
Change-Id: I4da338a90e0f094202bae73f9bd8622b37a3acf6
TreeHugger Robot [Mon, 17 Apr 2017 21:26:49 +0000 (21:26 +0000)]
Merge "Add user to channel/group modification callbacks." into oc-dev
Winson Chung [Mon, 17 Apr 2017 21:14:14 +0000 (21:14 +0000)]
Merge "Schedule PIP mode changes at the beginning/end of the transitions." into oc-dev
am:
11139e913c
Change-Id: I9b8d45c33bf3e83e7c25f5bafc2f7d90be9d875c
Todd Lee [Mon, 17 Apr 2017 21:12:59 +0000 (21:12 +0000)]
Merge "OEM single-build/multi-SKU via dynamic RRO support" into oc-dev
am:
c025ea892e
Change-Id: Ifb690a1ac7d9ff2605c88bd4503e06311ef0dd1c
Winson Chung [Mon, 17 Apr 2017 21:06:29 +0000 (21:06 +0000)]
Merge "Schedule PIP mode changes at the beginning/end of the transitions." into oc-dev
Geoffrey Pitsch [Thu, 6 Apr 2017 13:52:11 +0000 (09:52 -0400)]
Accessibility for Notification Inline Controls
Send WINDOW_STATE_CHANGED event in status bar
Disable falsing when in touch navigation
Accessibility string for enable/disable switch
Bug:
34840327
Test: runtest systemui
Change-Id: I60cc7e49d9e6323e23a17183b8b10c9d857501bb
Makoto Onuki [Mon, 17 Apr 2017 21:03:32 +0000 (21:03 +0000)]
Merge "Enhance PinItemRequest javadoc" into oc-dev
am:
5838563e93
Change-Id: Ie0233a300fe9dc046117602a891679e5f1b00a98
TreeHugger Robot [Mon, 17 Apr 2017 21:02:43 +0000 (21:02 +0000)]
Merge "OEM single-build/multi-SKU via dynamic RRO support" into oc-dev
Philip P. Moltmann [Mon, 17 Apr 2017 21:00:28 +0000 (21:00 +0000)]
Merge "Allow to finish session when all views are gone" into oc-dev
am:
3440e92009
Change-Id: I5adf95ccd456818f3858e7c2ee194d126be57f1f
Adrian Roos [Mon, 17 Apr 2017 20:58:41 +0000 (20:58 +0000)]
Merge "AOD: disable quicksettings while dozing" into oc-dev
am:
1c4c981c03
Change-Id: Icf289127886daf7eccd383aef18bd155f0d3ec67
Chris Craik [Mon, 17 Apr 2017 20:58:21 +0000 (13:58 -0700)]
Disable crashing drop shadow tests
Bug:
36272398
Test: HWUI unit tests now run without crashing
Change-Id: I2877ed184640e5043d33b10605db71dde501fd2a
Jordan Liu [Mon, 17 Apr 2017 20:56:45 +0000 (20:56 +0000)]
Merge "Update api for ServiceStateProvider" into oc-dev
am:
728fbfb7c1
Change-Id: I0b61681780b9337b5b6e36b1aadc23c52199ea08
Makoto Onuki [Mon, 17 Apr 2017 20:50:38 +0000 (20:50 +0000)]
Merge "Enhance PinItemRequest javadoc" into oc-dev
Makoto Onuki [Mon, 17 Apr 2017 20:46:36 +0000 (20:46 +0000)]
Merge "getApplicationInfo() should throw NameNotFoundException" into oc-dev
am:
c3fa6ab2ac
Change-Id: Ie67b77c8873b237a82e9ec470e3fcb698d474e3e
TreeHugger Robot [Mon, 17 Apr 2017 20:44:57 +0000 (20:44 +0000)]
Merge "Allow to finish session when all views are gone" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 20:41:02 +0000 (20:41 +0000)]
Merge "AOD: disable quicksettings while dozing" into oc-dev
Jordan Liu [Mon, 17 Apr 2017 20:37:25 +0000 (20:37 +0000)]
Merge "Update api for ServiceStateProvider" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 20:35:55 +0000 (20:35 +0000)]
Merge "getApplicationInfo() should throw NameNotFoundException" into oc-dev
Aurimas Liutikas [Mon, 17 Apr 2017 20:21:25 +0000 (20:21 +0000)]
Merge "Enhance Chronometer to better support Swedish countdowns." into oc-dev
am:
ff4e132cff
Change-Id: I72249172933a83c91c175dd46c96823368a25bda
TreeHugger Robot [Mon, 17 Apr 2017 20:15:16 +0000 (20:15 +0000)]
Merge "Enhance Chronometer to better support Swedish countdowns." into oc-dev
Jason Monk [Mon, 17 Apr 2017 20:04:30 +0000 (16:04 -0400)]
Fix up color issues as a result of theme change
Test: visual
Change-Id: I9adc8b85b40e3ac2df6099655c7479c74675b7bb
Fixes:
37372025
Fixes:
37362926
Fixes:
37358881
Fixes:
37326340
Chien-Yu Chen [Mon, 17 Apr 2017 19:58:03 +0000 (19:58 +0000)]
Merge "Camera: Override enableZsl based on SDK version" into oc-dev
am:
3b41407f19
Change-Id: I8399759e0ba6cf31aaa7fb2330272522b6abdf5c
TreeHugger Robot [Mon, 17 Apr 2017 19:49:07 +0000 (19:49 +0000)]
Merge "Camera: Override enableZsl based on SDK version" into oc-dev
Mike Tsao [Tue, 11 Apr 2017 20:57:31 +0000 (13:57 -0700)]
Add tests for ag/
2086796
Fixes:
37192695
Change-Id: Id0b3cbf986490d64cdc5592541dee1b004853503
Test: added
(cherry picked from commit
cfe4ffecceee005ff6bc79dcc1637f44f82bd43a)
Geoffrey Pitsch [Mon, 17 Apr 2017 19:28:40 +0000 (15:28 -0400)]
Warning if app targeting O posts a notification with no channel
Uses toast, but does not prevent the notification from posting.
Test: runtest systemui-notification
Bug:
35378789
Change-Id: I81426ee22a004b1d766f810565822a1ea237ccb4
Jason Monk [Mon, 17 Apr 2017 19:22:30 +0000 (15:22 -0400)]
Fix date going missing in QS
Test: Dismiss alarm while QS is expanded
Change-Id: I491deda22848af08db36dcffcb678f6ce2f1bdda
Fixes:
37259783
Jason Monk [Thu, 13 Apr 2017 19:27:04 +0000 (15:27 -0400)]
Status bar updates
- Wifi moves to right of cell
- Cell data and roaming indicator swap places
- Data disabled and no internet on cell look the same
- Don't show wifi in QS signal cluster, it has its status
right below.
Test: visual && runtest systemui
Fixes:
36717491
Change-Id: I16ebe6fb6dd519526a1e174753c8ce08c713d405
Joe LaPenna [Mon, 17 Apr 2017 19:08:19 +0000 (19:08 +0000)]
Merge "Make NETWORK_RECOMMENDATIONS_ENABLED hidden." into oc-dev
am:
5b06dbd12b
Change-Id: I29bf802473cd98352390a12120d2bbd9b293f5cf
TreeHugger Robot [Mon, 17 Apr 2017 19:02:58 +0000 (19:02 +0000)]
Merge "Make NETWORK_RECOMMENDATIONS_ENABLED hidden." into oc-dev
Brian Duddie [Mon, 17 Apr 2017 19:01:57 +0000 (19:01 +0000)]
Merge "ContextHubService: Pass on query requests" into oc-dev
am:
befd33975c
Change-Id: Id27aa1ec7d76e6f74a0f436ba5f8bd1643991f6e
Selim Cinek [Mon, 17 Apr 2017 19:00:28 +0000 (19:00 +0000)]
Merge changes I22b55b73,Id050f2f5 into oc-dev
am:
d8d7a283bd
Change-Id: Ia147e09d7974c2a4f810ee0df04c602be1760be4
Adrian Roos [Mon, 17 Apr 2017 18:59:20 +0000 (18:59 +0000)]
Merge "AOD: Fix icon color when updating on AOD" into oc-dev
am:
f0111ce8b6
Change-Id: Ie554c41a43c2a311d217a35fe96a6b81b56ceac6
TreeHugger Robot [Mon, 17 Apr 2017 18:51:43 +0000 (18:51 +0000)]
Merge "ContextHubService: Pass on query requests" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 18:51:01 +0000 (18:51 +0000)]
Merge changes I22b55b73,Id050f2f5 into oc-dev
* changes:
Only foreground service notifications can be colorized
Fixed a regression where the scrim would be black
Adrian Roos [Mon, 17 Apr 2017 18:48:37 +0000 (18:48 +0000)]
Merge "AOD: Fix icon color when updating on AOD" into oc-dev
Android Build Merger (Role) [Mon, 17 Apr 2017 18:45:54 +0000 (18:45 +0000)]
Merge "Merge "Fix issue #
35811414: Allow manifest receivers for ACTION_UID_REMOVED" into oc-dev am:
e15f91276c" into oc-dev-plus-aosp
Dianne Hackborn [Mon, 17 Apr 2017 18:44:58 +0000 (18:44 +0000)]
Merge "Fix issue #
35811414: Allow manifest receivers for ACTION_UID_REMOVED" into oc-dev
am:
e15f91276c
Change-Id: Iacccbcc734d5c49f483923c00625a49ad1d280a5
Jordan Liu [Mon, 17 Apr 2017 18:44:01 +0000 (18:44 +0000)]
Merge "Update api for ServiceStateProvider" am:
286b5f117d am:
ea4a67ddd1
am:
56a13d1bce
Change-Id: I8797fca65daa01ad86118b5f548a800e1854769c
TreeHugger Robot [Mon, 17 Apr 2017 18:38:57 +0000 (18:38 +0000)]
Merge "Fix issue #
35811414: Allow manifest receivers for ACTION_UID_REMOVED" into oc-dev
Adrian Roos [Mon, 17 Apr 2017 18:38:16 +0000 (11:38 -0700)]
AOD: disable quicksettings while dozing
Test: Trigger ambient display / AOD, verify quicksettings is not expandable
Bug:
37303800
Change-Id: I694360f4d728ff9714036d0b92176c922ff53e9a
Fan Zhang [Mon, 17 Apr 2017 18:37:45 +0000 (18:37 +0000)]
Merge "Remove FrameLayout around toolbar" into oc-dev
am:
46f6e69e1b
Change-Id: I2129c87b83a2346feff73cffcf26a2359f84e197
Yifan Hong [Mon, 17 Apr 2017 18:35:52 +0000 (18:35 +0000)]
Merge changes from topic 'vintf_check_compat_native' am:
6d033475b3
am:
4fccec4f81
Change-Id: Ib2691dd7d9b35d20ac71b50a090392e736b51bf7
Romain Guy [Mon, 17 Apr 2017 18:33:23 +0000 (18:33 +0000)]
Merge "Properly decode colors spaces in BitmapRegionDecoder" into oc-dev
am:
5b52cf6274
Change-Id: I86284be4dc506b6f4243ae27c4df848d874ca912
Yifan Hong [Mon, 17 Apr 2017 18:27:00 +0000 (18:27 +0000)]
Merge changes from topic 'vintf_check_compat_native'
am:
6d033475b3
Change-Id: I7cc64ab9938d17848379537b57d7092c0968c6a3
TreeHugger Robot [Mon, 17 Apr 2017 18:25:48 +0000 (18:25 +0000)]
Merge "Remove FrameLayout around toolbar" into oc-dev
Jordan Liu [Mon, 17 Apr 2017 18:21:56 +0000 (18:21 +0000)]
Merge "Update api for ServiceStateProvider" am:
286b5f117d
am:
ea4a67ddd1
Change-Id: Ib0ac43e24dbd4b1c0f037f6f3f3bc81b9acbae62
TreeHugger Robot [Mon, 17 Apr 2017 18:20:10 +0000 (18:20 +0000)]
Merge "Properly decode colors spaces in BitmapRegionDecoder" into oc-dev
Jeff Sharkey [Sun, 16 Apr 2017 19:18:35 +0000 (13:18 -0600)]
Storage API polishing.
Based on API council feedback, switch to using real UUID objects
instead of Strings. Since UUID is a general-purpose utility class
that will be passed around quite a bit, add it to Parcel and Bundle.
Define well-known namespaced UUID values for "default" and "primary
physical" storage devices, which will let us annotate a bunch of
things with @NonNull.
Define new extras for MANAGE_STORAGE intent that apps can use to
signal where and how much space they'd like the user to free up.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Bug:
37325923,
35812899,
35806020
Change-Id: I8421b126d680f69141a361c1e77223fe2bf4a325
Jordan Liu [Mon, 17 Apr 2017 18:14:23 +0000 (18:14 +0000)]
Merge "Update api for ServiceStateProvider"
am:
286b5f117d
Change-Id: I8404dad9be43a0ea41a973d289014a4fe1529ab3
Yifan Hong [Mon, 17 Apr 2017 18:12:27 +0000 (18:12 +0000)]
Merge changes from topic 'vintf_check_compat_native'
* changes:
Update for removing mount arg to VintfObject::CheckCompatibility
Add Java API for libvintf.
Jordan Liu [Wed, 1 Mar 2017 02:15:07 +0000 (18:15 -0800)]
Update api for ServiceStateProvider
ServiceStateProvider defines public constants in
Telephony.ServiceStateTable so update the api.
Test: flashed onto device locally
Bug:
33756364
Change-Id: I62b6b8bcfdf909aa36e44441f8672f98f581f896
Merged-In: I62b6b8bcfdf909aa36e44441f8672f98f581f896
Treehugger Robot [Mon, 17 Apr 2017 18:05:02 +0000 (18:05 +0000)]
Merge "Update api for ServiceStateProvider"
Jaewan Kim [Mon, 17 Apr 2017 18:00:26 +0000 (18:00 +0000)]
Merge "TV PIP: Remove onboarding activity and overlay activity" into oc-dev
am:
bde4eb5bcb
Change-Id: I0b81c971b5b466e967b8255cfc400c780c9078ba
Tyler Gunn [Mon, 17 Apr 2017 17:58:49 +0000 (17:58 +0000)]
Merge "DO NOT MERGE Expose phone account register/unregister intents." into oc-dev
am:
790ec07c26
Change-Id: I6f5294d93d11d72b2d14795b22757e68259b0c95
TreeHugger Robot [Mon, 17 Apr 2017 17:53:15 +0000 (17:53 +0000)]
Merge "TV PIP: Remove onboarding activity and overlay activity" into oc-dev
Chris Tate [Mon, 17 Apr 2017 17:44:18 +0000 (17:44 +0000)]
Merge "Don't back up disabled apps" into oc-dev
am:
628690ea2b
Change-Id: If8008f3c14bdb12dee5e400ce96394e1f541f462
Android Build Merger (Role) [Mon, 17 Apr 2017 17:41:06 +0000 (17:41 +0000)]
Merge "Merge "WifiManager: add new methods to start softap" am:
be2653d41e am:
334fe54661 am:
2dda9f5d66" into oc-dev-plus-aosp
Tyler Gunn [Mon, 17 Apr 2017 17:40:44 +0000 (17:40 +0000)]
Merge "DO NOT MERGE Expose phone account register/unregister intents." into oc-dev
Rebecca Silberstein [Mon, 17 Apr 2017 17:39:55 +0000 (17:39 +0000)]
Merge "WifiManager: add new methods to start softap" am:
be2653d41e am:
334fe54661
am:
2dda9f5d66
Change-Id: Ie2476bbae3554bd9fc203c478d25cb2e2898c8e3
Yoshinori Hirano [Mon, 17 Apr 2017 17:39:45 +0000 (17:39 +0000)]
Merge "Fix EmergencyCryptKeeperText initialization" into oc-dev
am:
1afa1646a2
Change-Id: I2cf920ba553587c4da04a1f1973a15d48c89ed80
Tyler Gunn [Fri, 14 Apr 2017 20:43:30 +0000 (13:43 -0700)]
DO NOT MERGE Expose phone account register/unregister intents.
These were previously @SystemApi. Retaining the existing SystemAPI
behavior which sends the intents to those with a private permission.
Extending to ALSO send these intents to the default dialer app as well
using an explicit intent.
Cherry-pick from aosp-master to resolve merge conflicts.
Test: Manual
Bug:
37106957
Merged-In: Ifb72870105be5ba024af196a8c3165a9afb397ab
Change-Id: Ifb72870105be5ba024af196a8c3165a9afb397ab
(cherry picked from commit
d9da6ce9938b4222cfb409f172cacfe4cf1593e6)
Chris Tate [Mon, 17 Apr 2017 17:35:46 +0000 (17:35 +0000)]
Merge "Don't back up disabled apps" into oc-dev
Rebecca Silberstein [Mon, 17 Apr 2017 17:30:08 +0000 (17:30 +0000)]
Merge "WifiManager: add new methods to start softap" am:
be2653d41e
am:
334fe54661
Change-Id: I3e0455020c5b0c1896c1994a821832e0e45ae4e6
TreeHugger Robot [Mon, 17 Apr 2017 17:28:33 +0000 (17:28 +0000)]
Merge "Fix EmergencyCryptKeeperText initialization" into oc-dev
Rebecca Silberstein [Mon, 17 Apr 2017 17:20:42 +0000 (17:20 +0000)]
Merge "WifiManager: add new methods to start softap"
am:
be2653d41e
Change-Id: Ic73c0b8f52c86f00a6d03687b37b4c02f41d4fcc
OSDN Git Service
