OSDN Git Service
Sungsoo Lim [Tue, 18 Apr 2017 00:53:14 +0000 (00:53 +0000)]
Merge "Revert "MediaSession: Add methods for setting shuffle and repeat modes"" into oc-dev
am:
ab16ea9094
Change-Id: I84277311c9215c23ecb02ccef90a54e89d921cb4
Adrian Roos [Tue, 18 Apr 2017 00:50:02 +0000 (00:50 +0000)]
Merge "AOD: Implement redacted notificatinos" into oc-dev
am:
89e8b7b58e
Change-Id: I92526d3c656647fa42c0a6266d4d33f035e54c9f
Sungsoo Lim [Tue, 18 Apr 2017 00:46:57 +0000 (00:46 +0000)]
Merge "Revert "MediaSession: Add methods for queue managements"" into oc-dev
am:
a44d7cd25b
Change-Id: I0831739bd0eb7317ea69adc7569d86e11a1f9fb3
Sungsoo Lim [Tue, 18 Apr 2017 00:37:33 +0000 (00:37 +0000)]
Merge "MediaBrowser: Revert Search API" into oc-dev
am:
51d91bff17
Change-Id: I0ec694cdbf24bd6e9dbacb22b93b4b644c3f524d
Sungsoo Lim [Tue, 18 Apr 2017 00:32:51 +0000 (00:32 +0000)]
Merge "Revert "MediaSession: Add methods for setting shuffle and repeat modes"" into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 00:31:52 +0000 (00:31 +0000)]
Merge "AOD: Implement redacted notificatinos" into oc-dev
Sungsoo Lim [Tue, 18 Apr 2017 00:31:28 +0000 (00:31 +0000)]
Merge "Revert "MediaSession: Add methods for queue managements"" into oc-dev
Sungsoo Lim [Tue, 18 Apr 2017 00:26:18 +0000 (00:26 +0000)]
Merge "MediaBrowser: Revert Search API" into oc-dev
Adrian Roos [Tue, 18 Apr 2017 00:17:26 +0000 (00:17 +0000)]
Merge "AOD: Do not show guts nor snooze" into oc-dev
am:
96da371a6d
Change-Id: I9aea00c77f69134dedde0f77c277a0eed815a125
Dianne Hackborn [Tue, 18 Apr 2017 00:15:46 +0000 (00:15 +0000)]
Merge "Fix issue #
36858643: Runtime restart on OPR1.170323.002" into oc-dev
am:
4bcc9bf0f2
Change-Id: Ia81a46e967dc3a9cebe8bb82947ccd72ca9ef862
TreeHugger Robot [Tue, 18 Apr 2017 00:07:58 +0000 (00:07 +0000)]
Merge "AOD: Do not show guts nor snooze" into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 00:04:45 +0000 (00:04 +0000)]
Merge "Fix issue #
36858643: Runtime restart on OPR1.170323.002" into oc-dev
Todd Kennedy [Tue, 18 Apr 2017 00:04:11 +0000 (00:04 +0000)]
Merge "only log calling package for instant apps" into oc-dev
am:
00168492a8
Change-Id: Ic7b875decf99989d7fb216a8df6878575027ac6d
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:57:33 +0000 (23:57 +0000)]
Merge "only log calling package for instant apps" into oc-dev
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
Adrian Roos [Mon, 17 Apr 2017 18:17:59 +0000 (11:17 -0700)]
AOD: Implement redacted notificatinos
Test: Turn on "show sensitive notifications on lockscreen", receive notification, observe AOD
Bug:
36610748
Change-Id: I981ef4cea7cefc76dcd55ebad9d05c758927dabb
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
Todd Kennedy [Mon, 17 Apr 2017 21:53:49 +0000 (14:53 -0700)]
only log calling package for instant apps
Change-Id: I71b09fd130f27d5814638fdaaec33f759b0b2346
Fixes:
37425492
Test: manual
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
Adrian Roos [Mon, 17 Apr 2017 21:16:20 +0000 (14:16 -0700)]
AOD: Do not show guts nor snooze
Fixes:
37179751
Test: receive notification while phone is off, try longpress or accessing the gear icon through swiping, ensure neither works
Change-Id: If18ac166eac28cd7ad05a12f670b2ddbad9e29b8
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
Dianne Hackborn [Sat, 15 Apr 2017 00:57:33 +0000 (17:57 -0700)]
Fix issue #
36858643: Runtime restart on OPR1.170323.002
We had a layering problem between alarm manager, device idle
controller, and activity manager. The layering should be, from
bottom to top:
activity manager
alarm manager
device idle controller.
However in the path of activity manager's PendingIntent.send(),
it would do a direct call to device idle controller. It was
careful to do this without its lock held, but that isn't enough.
In this case, alarm manager is doing send() with its lock held,
expecting that to be safe, but it ends up causing it to call up
in to device idle controller via the activity manager (in order
to update the temporary whitelist).
To fix this, activity manager now has an internal data structure
representing pending temp whitelist requests, and all it does is
add to that during the call in, scheduling a message to later
dispatch those to device idle controller. But to make things
correct, we need to use this data stucture to act like the uid
is already on the temp whitelist even before we actually dispatch
that message. (So we don't have races with things calling
startService() for example.) So all the existing stuff looking
at the temp whitelist that is handed down by device idle controller
will also consult with this data structure of pending changes.
Test: bit CtsAppTestCases:ActivityManagerProcessStateTest
Change-Id: Id444b7ad3e694dc977c7f4fa236fbad855ce4066
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