OSDN Git Service
TreeHugger Robot [Fri, 13 Apr 2018 17:38:13 +0000 (17:38 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 17:36:14 +0000 (17:36 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 17:34:19 +0000 (17:34 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Michael Wright [Fri, 13 Apr 2018 17:33:15 +0000 (17:33 +0000)]
Merge "Revert "Fixed power manager CTS test."" into pi-dev
Michael Wright [Fri, 13 Apr 2018 17:29:37 +0000 (17:29 +0000)]
Revert "Fixed power manager CTS test."
This reverts commit
48fed61da3f3671850aae3c521a3e6f088169de2.
Reason for revert: m checkbuild failing
Bug:
77907164
Change-Id: I7f75dafc049581a7a5393c3cf0108c488eecaf48
TreeHugger Robot [Fri, 13 Apr 2018 17:31:19 +0000 (17:31 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 16:59:28 +0000 (16:59 +0000)]
Merge "Fixed power manager CTS test." into pi-dev
Winson Chung [Fri, 13 Apr 2018 16:41:18 +0000 (16:41 +0000)]
Merge "Initialize the animation leash with the current values" into pi-dev
Lifu Tang [Fri, 13 Apr 2018 16:30:40 +0000 (16:30 +0000)]
Merge "Mark location-related PendingIntents as restricted" into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 15:43:22 +0000 (15:43 +0000)]
Merge "Don't show ringer status if dnd overrides it" into pi-dev
David Brazdil [Fri, 13 Apr 2018 14:46:47 +0000 (14:46 +0000)]
Merge "Add more hidden API on light greylist" into pi-dev
Dan Gittik [Fri, 13 Apr 2018 14:43:20 +0000 (15:43 +0100)]
Fixed power manager CTS test.
Added an annotation necessary to allow the power manager CTS test to
access the non-public method nap.
Test: adb install -r \
out/host/linux-x86/cts/android-cts/testcases/CtsOsTestCases.apk
adb shell am instrument -e class android.os.cts.PowerManagerTest \
-w android.os.cts/android.support.test.runner.AndroidJUnitRunner
Change-Id: I91e591be608f5040bc035a203d7e94c83d50bf15
Fixes:
77907164
TreeHugger Robot [Fri, 13 Apr 2018 13:40:10 +0000 (13:40 +0000)]
Merge "Protect slice permissions text" into pi-dev
Bill Yi [Fri, 13 Apr 2018 13:02:06 +0000 (06:02 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I5b400d5bf5084cfdfc40edd2e44f19d5b1b659ac
TreeHugger Robot [Fri, 13 Apr 2018 12:54:15 +0000 (12:54 +0000)]
Merge "Do not allow QS to collapsed when customizing." into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 11:41:32 +0000 (11:41 +0000)]
Merge "Notif manager and captive portal app to read SSID again" into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 10:13:43 +0000 (10:13 +0000)]
Merge "CameraProxy: Clear calling identity before scheduling" into pi-dev
Eran Messeri [Fri, 13 Apr 2018 10:07:36 +0000 (10:07 +0000)]
Merge "AttestationUtils: Request MEID explicitly" into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 09:59:45 +0000 (09:59 +0000)]
Merge "PointerLocation: do not letterbox for cutouts" into pi-dev
Bill Yi [Fri, 13 Apr 2018 09:44:18 +0000 (02:44 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I88071bb02adecf089e39dfee4a6add3f5ded6cae
Bill Yi [Fri, 13 Apr 2018 09:19:08 +0000 (02:19 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ib75133d5980ff748e1e9ed9f3fba99ffc40629f2
Bill Yi [Fri, 13 Apr 2018 09:12:24 +0000 (02:12 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ib2d68bcafafbf825f4f78870f815c3a43aadd8fe
TreeHugger Robot [Fri, 13 Apr 2018 08:59:23 +0000 (08:59 +0000)]
Merge "Add a new ssid field in NetworkCapabilities." into pi-dev
Benjamin Franz [Fri, 13 Apr 2018 07:37:25 +0000 (07:37 +0000)]
Merge "Silently ignore force stop API for protected packages" into pi-dev
Bo Zhu [Fri, 13 Apr 2018 07:22:48 +0000 (07:22 +0000)]
Merge "Use Scrypt to hash all passwords in RecoverableKeyStore" into pi-dev
Chalard Jean [Thu, 12 Apr 2018 02:52:37 +0000 (11:52 +0900)]
Notif manager and captive portal app to read SSID again
Bug:
77114259
Test: frameworks-net pass
manual test shows the SSID is now displayed again
Change-Id: I5cb2b4777ad78d972031e8f2ff22e2155f4ab894
Chalard Jean [Wed, 11 Apr 2018 12:09:10 +0000 (21:09 +0900)]
Add a new ssid field in NetworkCapabilities.
Bug:
77891227
Test: frameworks-net
Change-Id: Ifba33ecd48ccecce7e8f8d05ff70bb85653f6163
Mehdi Alizadeh [Fri, 13 Apr 2018 04:33:23 +0000 (04:33 +0000)]
Merge "Adds SettingsCompat to mirror settings names used in Launcher" into pi-dev
Tomasz Wasilczyk [Fri, 13 Apr 2018 03:13:18 +0000 (03:13 +0000)]
Merge "Fix AM band range." into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 02:48:39 +0000 (02:48 +0000)]
Merge "Fix pinned slices returning different Uris." into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 02:32:38 +0000 (02:32 +0000)]
Merge "Exposing activity type in targets so that we can handle home activity differently" into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 02:09:27 +0000 (02:09 +0000)]
Merge "Fix measurement of list with single item" into pi-dev
Mehdi Alizadeh [Fri, 13 Apr 2018 01:59:36 +0000 (18:59 -0700)]
Adds SettingsCompat to mirror settings names used in Launcher
Bug:
77732469
Test: verify it builds
Change-Id: I2d0dee714a7d5eb59f189302d97414f3117a624b
Sunny Goyal [Fri, 13 Apr 2018 01:09:38 +0000 (18:09 -0700)]
Exposing activity type in targets so that we can handle home activity differently
Test: Verified library with launcher
Bug:
77830202
Change-Id: I072013725190aced116093808029973b278ed263
Lucas Dupin [Fri, 13 Apr 2018 00:45:29 +0000 (17:45 -0700)]
Fix measurement of list with single item
Change-Id: I2474410b7374155bbbe5de0c757e9017f52746e5
Fixes:
72656378
Test: visual
Jason Monk [Mon, 9 Apr 2018 12:10:59 +0000 (08:10 -0400)]
Protect slice permissions text
Bug:
72749457
Change-Id: I4c1820b2696b61d51f9a3d500b16b4c323fa731f
TreeHugger Robot [Fri, 13 Apr 2018 00:24:50 +0000 (00:24 +0000)]
Merge "Have UserController use a CarUserSwitchingDialog instead of a UserSwitchingDialog if the FEATURE_AUTOMOTIVE flag is present so Android Auto can customize the look of the dialog." into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 00:20:16 +0000 (00:20 +0000)]
Merge "Fix the null check in LocalBluetoothProfileManager" into pi-dev
Winson Chung [Fri, 13 Apr 2018 00:14:50 +0000 (17:14 -0700)]
Initialize the animation leash with the current values
- We already do this with remote animations, need to do this with the
recents animation to ensure that layers are set correctly by default.
Bug:
77981669
Test: Open app, open translucent activity, swipe up and ensure that they
don't reorder during the transition
Change-Id: I492d12b871c602e348ea0623752787b8b0ac3f10
Jason Monk [Thu, 12 Apr 2018 23:47:50 +0000 (19:47 -0400)]
Fix pinned slices returning different Uris.
Test: cts
Bug:
77980070
Change-Id: I3c5ba18e40a58371e2c9ccade9d565b38ad12a54
Lifu Tang [Thu, 12 Apr 2018 23:39:39 +0000 (16:39 -0700)]
Mark location-related PendingIntents as restricted
Bug:
77237719
Test: build and flash a device
Change-Id: Id12792aca29fef6adff4943c551c03e6eb6e851c
TreeHugger Robot [Thu, 12 Apr 2018 23:36:29 +0000 (23:36 +0000)]
Merge "Add tests to cover handling negative varint." into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 23:23:00 +0000 (23:23 +0000)]
Merge "Revert "Revert "Update material_deep_teal_500 to #008577.""" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 23:03:39 +0000 (23:03 +0000)]
Merge "Adding privacy tags to graphicsstats proto." into pi-dev
Hansong Zhang [Tue, 10 Apr 2018 23:06:19 +0000 (16:06 -0700)]
Fix the null check in LocalBluetoothProfileManager
Check mHidDeviceProfile != null before invoking
mHidDeviceProfile.getConnectionStatus()
Bug:
77856868
Test: manual; run LocalBluetoothProfileManagerTest
Change-Id: If3cc7d55265e6734176044e97b32a44e7b1a1a62
Yi Jin [Wed, 11 Apr 2018 23:11:05 +0000 (16:11 -0700)]
Add tests to cover handling negative varint.
The gtest will fail if the fix of b/
77291057 isn't there. Should make
this change in with the fix, but later than none.
Bug:
77291057
Test: atest incidentd_test
Change-Id: I48ece311f78ee18d97486839a3b8b434c9419cf3
Jovana Knezevic [Thu, 12 Apr 2018 22:42:11 +0000 (22:42 +0000)]
Merge "Fixing when the full-screen switcher appears." into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 22:34:16 +0000 (22:34 +0000)]
Merge "Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE" into pi-dev
Bo Zhu [Fri, 6 Apr 2018 16:57:02 +0000 (09:57 -0700)]
Use Scrypt to hash all passwords in RecoverableKeyStore
Bug:
77325751
Test: runtest frameworks-services -p
com.android.server.locksettings.recoverablekeystor
Change-Id: Ifd934593a2161e397eac77b682e3f4bb2d518822
Beverly [Thu, 12 Apr 2018 19:02:45 +0000 (15:02 -0400)]
Don't show ringer status if dnd overrides it
If DND is overriding the ringer then:
- Don't show silent/vibrate ringer in status bar
- Don't show silent/vibrate ringer status in QS
Change-Id: I0c921905c6b06e1379b497dd1ac9e3fce483d5fd
Fixes:
77651394
Test: manual
TreeHugger Robot [Thu, 12 Apr 2018 21:41:24 +0000 (21:41 +0000)]
Merge "Fix volume panel shadows" into pi-dev
Stanley Tng [Thu, 12 Apr 2018 21:39:52 +0000 (21:39 +0000)]
Merge "Add min_ce/max_ce parameters to requestLeConnectionUpdate()" into pi-dev
Kweku Adams [Tue, 3 Apr 2018 23:31:10 +0000 (16:31 -0700)]
Adding privacy tags to graphicsstats proto.
Creating a copy of the graphicsstats proto so that one can be tagged
with privacy annotations and the other can be used internally while
still using the protobuf-cpp-lite library.
Bug:
72570104
Test: flash device and check incident output
Merged-In: I2d72e7bd17689c1401a16d5a13956e6528ddb525
Change-Id: I0a46ee6cc463b133925be1cf8dee8cf3d107930c
TreeHugger Robot [Thu, 12 Apr 2018 21:13:34 +0000 (21:13 +0000)]
Merge "Remove poorly defined notification APIs." into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 21:01:16 +0000 (21:01 +0000)]
Merge "Changed the appearance of phone call notifications" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 20:54:46 +0000 (20:54 +0000)]
Merge "Use system property to get the package name for media update" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 20:43:10 +0000 (20:43 +0000)]
Merge "Add method to get blocked app count" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 20:29:07 +0000 (20:29 +0000)]
Merge "Volume iconography update" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 19:54:12 +0000 (19:54 +0000)]
Merge "Add rate limiting and logging for NetworkStats." into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 19:52:39 +0000 (19:52 +0000)]
Merge "Change fingerprint dialog radius to 4dp" into pi-dev
Julia Reynolds [Thu, 12 Apr 2018 19:38:54 +0000 (15:38 -0400)]
Fix volume panel shadows
Test: manual
Change-Id: I540ca9e1b0bc8359b562a1279e66a4c8fc05f4a0
Fixes:
77538456
Fixes:
77640244
Chris Tate [Thu, 12 Apr 2018 19:41:31 +0000 (19:41 +0000)]
Merge "Correct bg service start policy re bg-restricted state" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 19:39:39 +0000 (19:39 +0000)]
Merge "Move QuickStep onboarding strings from Launcher to SysUI" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 19:33:50 +0000 (19:33 +0000)]
Merge "Catch exceptions reading calendar events" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 19:33:29 +0000 (19:33 +0000)]
Merge "Limit status icons and show etc dots" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 19:23:43 +0000 (19:23 +0000)]
Merge "Show warning when enabling airplane mode in ECM." into pi-dev
Dmitry Dementyev [Thu, 12 Apr 2018 19:14:26 +0000 (19:14 +0000)]
Merge "Don't store deprecated trustedHardwarePublicKey field." into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 19:09:39 +0000 (19:09 +0000)]
Merge "Greylist APIs used by Android Auto projection" into pi-dev
Julia Reynolds [Thu, 12 Apr 2018 18:42:08 +0000 (14:42 -0400)]
Volume iconography update
- Update icon color based on active state
- Make the accessibility icon the same size as the rest
Test: manual
Change-Id: I213bb99b7a45e42d0ac756508a00c554e55d551f
Fixes:
77538644
Fixes:
77540071
Aarthi Balachander [Wed, 11 Apr 2018 02:26:45 +0000 (19:26 -0700)]
Have UserController use a CarUserSwitchingDialog instead of a
UserSwitchingDialog if the FEATURE_AUTOMOTIVE flag is present
so Android Auto can customize the look of the dialog.
+ minor changes to fix colors and sizes
Test: tested on Mojave
bug:
75023449
Change-Id: Icf8b63acf257505a3e58fa368be0dd57a60960b4
Remi NGUYEN VAN [Thu, 12 Apr 2018 10:26:34 +0000 (19:26 +0900)]
Add rate limiting and logging for NetworkStats.
Bug:
77908520,
77808546,
77853238,
77154412
Test: atest com.android.server.net.NetworkStatsServiceTest
Test: manual: flashed, verified network usage updated
Change-Id: I905dbea85e00f80103916939f6d4bf8cab931d03
TreeHugger Robot [Thu, 12 Apr 2018 18:30:45 +0000 (18:30 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Jeff Sharkey [Thu, 12 Apr 2018 18:21:59 +0000 (12:21 -0600)]
Remove poorly defined notification APIs.
They were rushed in at the last second, and feedback from stakeholders
reveals they're not ready for prime time.
Bug:
77851691
Test: builds, boots
Exempt-From-Owner-Approval: SDK finalization
Change-Id: I96f6c80610627878a29543b345419924774a60e0
Tracy Zhou [Thu, 12 Apr 2018 03:40:53 +0000 (20:40 -0700)]
Move QuickStep onboarding strings from Launcher to SysUI
Test: N/A
Bug:
70180942
Change-Id: Ic3bd63899017f23c011a41a7a5a9e73a87b9eec1
Julia Reynolds [Thu, 12 Apr 2018 18:16:09 +0000 (14:16 -0400)]
Catch exceptions reading calendar events
Test: none
Change-Id: I3be8d3abc5feead1d940ab86d8edcd770187eca9
Fixes:
70568179
TreeHugger Robot [Thu, 12 Apr 2018 18:20:34 +0000 (18:20 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Selim Cinek [Wed, 11 Apr 2018 00:46:46 +0000 (17:46 -0700)]
Changed the appearance of phone call notifications
The old design didn't work at all because of various
paddings. The new design adds more paddings and a
new button style
Fixes:
72814598
Test: runtest systemui
Change-Id: I4b4ac0790afe45db97f912740446c6da09620be3
Kevin Chyn [Thu, 12 Apr 2018 18:07:57 +0000 (11:07 -0700)]
Change fingerprint dialog radius to 4dp
Fixes:
77864901
Test: manual test with AOSP build
Change-Id: Ib61052a45c8de1b684527c54d73cfb45ffe672b5
Evan Laird [Thu, 12 Apr 2018 13:54:11 +0000 (09:54 -0400)]
Limit status icons and show etc dots
When <= 5 status icons exist, try to show them all (space permitting).
If > 5 exist, show 4 and etc dots.
Test: visual
Change-Id: I4c09344bee75b3cab6256dd69f11337b9b667b0f
Fixes:
73778753
Fixes:
77660387
Bug:
77822905
jovanak [Wed, 11 Apr 2018 22:20:16 +0000 (15:20 -0700)]
Fixing when the full-screen switcher appears.
Now, full screen user switcher always shows up on reboot.
The switcher is dismissed after "switch" to another user
is detected.
Switching should lead to authentication directly
Bug:
74445625
Test: Repeated boot and switch on Mojave, with single and many users.
Change-Id: Ia1645246276d9eb65288c01c8c320c82a796d442
Julia Reynolds [Thu, 12 Apr 2018 17:48:49 +0000 (13:48 -0400)]
Add method to get blocked app count
So we can sure it in settings
Test: runtest systemui-notification
Bug:
73018368
Change-Id: Ib0185e97f8e1cec1864ca1e4efb23bf8db097901
Amin Shaikh [Thu, 12 Apr 2018 17:29:32 +0000 (13:29 -0400)]
Show warning when enabling airplane mode in ECM.
Change-Id: I85401e661243f189589d4914479da9e60242d192
Fixes:
73084792
Test: manual
Kweku Adams [Thu, 12 Apr 2018 17:23:17 +0000 (17:23 +0000)]
Merge "Setting stack traces to EXPLICIT." into pi-dev
Ryan Mitchell [Thu, 12 Apr 2018 17:21:32 +0000 (17:21 +0000)]
Merge "AAPT: Multiple period legacy support and errors" into pi-dev
Colin Cross [Thu, 12 Apr 2018 17:12:18 +0000 (10:12 -0700)]
Greylist APIs used by Android Auto projection
Fixes:
04-06 19:12:06.529 W android.gms:ca: Accessing hidden method Landroid/media/AudioAttributes$Builder;->addTag(Ljava/lang/String;)Landroid/media/AudioAttributes$Builder; (blacklist, reflection)
Bug:
77315795
Test: make
Change-Id: I171fbfb60623a970285ac89499bbb94b1e5e57d4
TreeHugger Robot [Thu, 12 Apr 2018 17:05:12 +0000 (17:05 +0000)]
Merge "Change log level when microphone enumeration APIs native call fail." into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 16:40:37 +0000 (16:40 +0000)]
Merge "Pre P apps can't change new fields" into pi-dev
Eran Messeri [Thu, 12 Apr 2018 13:06:59 +0000 (14:06 +0100)]
AttestationUtils: Request MEID explicitly
Rather than rely on getDeviceId to provide the MEID, explicitly use
getMeid to get it.
For MEID attestation to work, the right identifier needs to be passed in
for attestation by Keymaster.
AttestationUtils currently gets this identifier by calling getDeviceId.
This would only yield the MEID if the device does not have an IMEI
provisioned, which means it'll get the IMEI for devices that have both
(like Pixel 2).
According to bartfab@ that is the correct way (see b/
77584730#13).
Bug:
77584730
Bug:
73284024
Test: runtest --path cts/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java
Change-Id: I98f6c2e2a9835bf2fd681cfb4ff74fc3984c3a8e
TreeHugger Robot [Thu, 12 Apr 2018 16:06:36 +0000 (16:06 +0000)]
Merge "Revert "Clear out tuner prefs since it is disabled"" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 16:02:07 +0000 (16:02 +0000)]
Merge "Check in the new work profile icon" into pi-dev
Stanley Tng [Mon, 19 Mar 2018 19:28:56 +0000 (12:28 -0700)]
Add min_ce/max_ce parameters to requestLeConnectionUpdate()
Add new test parameters, min_ce and max_ce, to the SL4A tests for LE
Connection-oriented Channel (CoC) feature. This CL passes these 2
parameters to native stack.
Test: Run cmd: act.py -c $MY_SL4A_CONFIG -tc BleCoc2ConnTest
Bug:
77528723
Change-Id: I9d3d74f671772014209f8114c2d1b8ba606c54d5
(cherry picked from commit
148dd5bf861ad2caac0c53a53ee5154bfa413405)
TreeHugger Robot [Thu, 12 Apr 2018 15:53:03 +0000 (15:53 +0000)]
Merge "Ensure we do not set seInfoTargetSdkVersion to 0." into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 15:47:30 +0000 (15:47 +0000)]
Merge "[Notif] Use OK instead of DONE for blocking helper" into pi-dev
David Brazdil [Thu, 12 Apr 2018 14:27:46 +0000 (15:27 +0100)]
Add more hidden API on light greylist
This is from CtsOsTestCases which we cannot exempt because it also
tests StrictMode.
Test: cd cts/tests/tests/os && atest .
Bug:
77909325
Change-Id: Id0fee2c48612d69c5cf4f31bd32e29a19ffd8f0e
Julia Reynolds [Thu, 12 Apr 2018 14:48:46 +0000 (10:48 -0400)]
Pre P apps can't change new fields
Screen off means fullscreen intents, lights, and ambient
in P but pre-P mean only lights and full screen intents.
Test: runtest systemui-notification, cts
Change-Id: I83857b5df2f669751df34d58aa645f4102b8e0e4
Fixes:
77470790
Jason Monk [Thu, 12 Apr 2018 14:58:06 +0000 (14:58 +0000)]
Revert "Clear out tuner prefs since it is disabled"
Bug:
74851117
Fixes:
77937472
This reverts commit
8bb9bbf152e35cdb4263aa1132827d51eb57e8b4.
Change-Id: I2dea3fec7ca3f59c63ce9395ba2784ca9dc58316
TreeHugger Robot [Thu, 12 Apr 2018 14:55:55 +0000 (14:55 +0000)]
Merge changes I6358cfe3,I00b20bd7 into pi-dev
* changes:
Fix status icon tint in QQS.
Fix QQS side padding for icons and tiles.
Rohan Shah [Thu, 12 Apr 2018 14:49:11 +0000 (14:49 +0000)]
Merge "[Notif] Allow locking importance on notification" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 14:35:33 +0000 (14:35 +0000)]
Merge "ScreenDecorations: Only draw cutout if requested" into pi-dev
Tony Mak [Thu, 12 Apr 2018 14:30:24 +0000 (15:30 +0100)]
Check in the new work profile icon
Test: Settings -> Google -> Observe the icon
Fixes:
77952474
Change-Id: I7b26651bbc06aa496ae98f3030a3a1458ffdba1f