OSDN Git Service
Jason Monk [Thu, 8 Jun 2017 17:00:40 +0000 (13:00 -0400)]
resolve merge conflicts of
a5b457b3bf6f to oc-dr1-dev
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2aa49bfdbd2c44684d0edb21b52520fea406e167
Jason Monk [Thu, 8 Jun 2017 16:35:21 +0000 (16:35 +0000)]
Merge "Move QS cell indicator back into mobile data tile" into oc-dev
Svetoslav Ganov [Thu, 8 Jun 2017 16:01:54 +0000 (16:01 +0000)]
Merge "Ensure only test print services enabled - framework" into oc-dev
am:
053fb9120e
Change-Id: I5f07488ba286cb3d01c75d96e1003edba845daf8
TreeHugger Robot [Thu, 8 Jun 2017 15:55:05 +0000 (15:55 +0000)]
Merge "Ensure only test print services enabled - framework" into oc-dev
Andrei Stingaceanu [Thu, 8 Jun 2017 14:44:20 +0000 (14:44 +0000)]
Merge "Fix unexpected DatePicker validation" into oc-dev
am:
cd603221e1
Change-Id: Iaa491c27aebc60be5fe16668dda7904e2b089f54
Wale Ogunwale [Thu, 8 Jun 2017 14:41:34 +0000 (14:41 +0000)]
Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev
am:
13059cc2ad
Change-Id: I079d34636465188b0d2bd231c798c44343bbc3b5
TreeHugger Robot [Thu, 8 Jun 2017 14:36:07 +0000 (14:36 +0000)]
Merge "Fix unexpected DatePicker validation" into oc-dev
Wale Ogunwale [Thu, 8 Jun 2017 14:33:03 +0000 (14:33 +0000)]
Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev
Selim Cinek [Thu, 8 Jun 2017 14:15:29 +0000 (14:15 +0000)]
Merge "Fixed a bug where the navigation notification would flicker" into oc-dev
am:
b18f65a168
Change-Id: I385374ede44f09bb729ec7df7be13dc62c19bb2a
Selim Cinek [Thu, 8 Jun 2017 14:07:14 +0000 (14:07 +0000)]
Merge "Fixed a bug where the navigation notification would flicker" into oc-dev
Erik Kline [Thu, 8 Jun 2017 13:32:57 +0000 (13:32 +0000)]
Delete legacy "wifi interface name guessing" behaviour
am:
9e22554068
Change-Id: Iecb4498c004a45403213d6e4bd7b6f8725334646
Erik Kline [Thu, 8 Jun 2017 08:48:48 +0000 (17:48 +0900)]
Delete legacy "wifi interface name guessing" behaviour
Now that Wi-Fi always passes us the AP interface name (and mode)
we no longer need to guess which interface on which we're supposed
to be starting IP serving (either tethering or local-only hotspot).
Test: as follows
- built
- flashed
- booted
- TetheringTest passes
Bug:
32163131
Bug:
62343300
Change-Id: I6019410ee5adff4929690d35ba09294765fcd6a4
Felipe Leme [Thu, 8 Jun 2017 06:07:15 +0000 (06:07 +0000)]
Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev
am:
9be8c96918
Change-Id: Ib165e14765a74e77fd41d15d979bf7f7ac0726ed
Mark Rathjen [Thu, 8 Jun 2017 06:04:54 +0000 (06:04 +0000)]
Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev
am:
3492ed4376
Change-Id: I49015844829d55a903437a807b345688794002b5
Yuchen He [Thu, 8 Jun 2017 06:01:50 +0000 (06:01 +0000)]
Merge "Fix AeModeAndLock test cases. Bug:
36103813" into oc-dev
am:
3671e9249b
Change-Id: I0a9c3a30877d1aa54cc45a67abcd4444eebf63c4
Adam Bookatz [Thu, 8 Jun 2017 05:59:56 +0000 (05:59 +0000)]
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev
am:
6029bce3b4
Change-Id: Ib8292cc59afe1933bad8d48907ad47c46bb73e87
Todd Kennedy [Thu, 8 Jun 2017 05:54:33 +0000 (05:54 +0000)]
Merge changes Iea24e5a1,If71385bc into oc-dev
am:
3834421c96
Change-Id: I691d03a8396d26193622f171f70f82d7aa91cea2
Phil Weaver [Thu, 8 Jun 2017 05:52:11 +0000 (05:52 +0000)]
Merge "Confirm a11y shortcut service for correct user" into oc-dev
am:
03a5b3a509
Change-Id: I2e463c1602d1aca9d791d351f4170b0bac9abc90
Todd Kennedy [Thu, 8 Jun 2017 05:50:03 +0000 (05:50 +0000)]
Merge "Passing callingUid to internal methods" into oc-dev
am:
dacdf2e978
Change-Id: Ie6e85346f63f4b06e693e6a6ac0c73b2ec3b9639
Jeff Sharkey [Thu, 8 Jun 2017 05:47:38 +0000 (05:47 +0000)]
Merge "Add timeout to StrictMode flash." into oc-dev
am:
fdb3d31504
Change-Id: I646e27241743297d62a5442c845b61ee42b47a2f
Sudheer Shanka [Thu, 8 Jun 2017 05:44:49 +0000 (05:44 +0000)]
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
am:
f34713066e
Change-Id: Ic001bfa12fecb00b24d7170c841af21531bab28a
Ian Pedowitz [Thu, 8 Jun 2017 05:42:13 +0000 (05:42 +0000)]
Merge "resolve merge conflicts of
695f21a66189 to oc-dr1-dev" into oc-dr1-dev
Etan Cohen [Thu, 8 Jun 2017 05:26:13 +0000 (05:26 +0000)]
Merge "[AWARE] Add validity check on PMK/Passphrase lengths" into oc-dr1-dev
Felipe Leme [Thu, 8 Jun 2017 05:21:02 +0000 (05:21 +0000)]
Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev
Mark Rathjen [Thu, 8 Jun 2017 04:43:56 +0000 (04:43 +0000)]
Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev
Kevin Chyn [Mon, 5 Jun 2017 18:28:09 +0000 (11:28 -0700)]
Add setting and permission for assist gesture
Bug:
37427306
Test: manual
Merged-In: I659fa43fb085575df4d62e7765d88c6fd615fb7d
Change-Id: I659fa43fb085575df4d62e7765d88c6fd615fb7d
Yuchen He [Thu, 8 Jun 2017 04:32:31 +0000 (04:32 +0000)]
Merge "Fix AeModeAndLock test cases. Bug:
36103813" into oc-dev
Ian Pedowitz [Thu, 8 Jun 2017 00:47:38 +0000 (17:47 -0700)]
resolve merge conflicts of
695f21a66189 to oc-dr1-dev
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifeffa55c7fb80b0f327ecc5b50cefeca9db6457b
Merged-In: I558447f282bb54f13be1622c3f2528a383fbc3b7
Adam Bookatz [Thu, 8 Jun 2017 02:43:14 +0000 (02:43 +0000)]
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev
Svetoslav Ganov [Thu, 8 Jun 2017 01:50:02 +0000 (18:50 -0700)]
Ensure only test print services enabled - framework
Test: cts-tradefed run cts-dev -m CtsPrintTestCas
bug:
62232727
Change-Id: I1050272586d1c03dc1b1dfdb8b10e258912a249b
TreeHugger Robot [Thu, 8 Jun 2017 01:40:03 +0000 (01:40 +0000)]
Merge changes Iea24e5a1,If71385bc into oc-dev
* changes:
expand who can uninstall an instant app
Final changes to protect the API surface
Phil Weaver [Thu, 8 Jun 2017 01:37:43 +0000 (01:37 +0000)]
Merge "Confirm a11y shortcut service for correct user" into oc-dev
Selim Cinek [Tue, 6 Jun 2017 00:50:19 +0000 (17:50 -0700)]
Fixed a bug where the navigation notification would flicker
Change-Id: Id68ba339407287d67d8db888515389e79e09ece3
Fixes:
62339936
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationCustomViewWrapperTest.java
TreeHugger Robot [Thu, 8 Jun 2017 01:00:47 +0000 (01:00 +0000)]
Merge "Passing callingUid to internal methods" into oc-dev
Yuchen He [Fri, 12 May 2017 01:49:22 +0000 (18:49 -0700)]
Fix AeModeAndLock test cases.
Bug:
36103813
Change-Id: Ie2e9938f6ae607f5fced5048c5ff5e41e4f7836b
(cherry picked from commit
e256bc9f66c6812f02326432ed22f7adca47cc9c)
Jeff Sharkey [Thu, 8 Jun 2017 00:32:30 +0000 (00:32 +0000)]
Merge "Add timeout to StrictMode flash." into oc-dev
Sudheer Shanka [Thu, 8 Jun 2017 00:08:40 +0000 (00:08 +0000)]
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
Ian Pedowitz [Thu, 8 Jun 2017 00:00:16 +0000 (00:00 +0000)]
Merge "Fixed an issue where the icons had the wrong color" into oc-dev
Adrian Roos [Wed, 7 Jun 2017 23:59:53 +0000 (23:59 +0000)]
Merge "Keyguard: Increase clock size" into oc-dev
am:
2ff366a39a
Change-Id: I758d95a87400fe4643cd6cdb2c776de1975336b9
Adrian Roos [Wed, 7 Jun 2017 23:54:00 +0000 (23:54 +0000)]
Merge "Keyguard: Increase clock size" into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 23:40:32 +0000 (23:40 +0000)]
Merge "AmbientIndication: Add tap again hint" into oc-dr1-dev
Bryce Lee [Wed, 7 Jun 2017 23:31:48 +0000 (23:31 +0000)]
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev
am:
f867733d4f
Change-Id: Icaff526ff266e449eefdc6f471c37d94290662b6
Sundeep Ghuman [Wed, 7 Jun 2017 23:25:50 +0000 (23:25 +0000)]
Merge "Remove Wifi Badges from platform." into oc-dev
am:
09d06437ad
Change-Id: Ie5150009258a7bccfdf222bf21329722e1e20589
Bryce Lee [Wed, 7 Jun 2017 23:23:17 +0000 (23:23 +0000)]
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev
Sundeep Ghuman [Wed, 7 Jun 2017 23:23:20 +0000 (23:23 +0000)]
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev
am:
584406f8e1 -s ours
Change-Id: Ib9a20c7caf8a86a0611c9c91a4b0024686e3f5e9
TreeHugger Robot [Wed, 7 Jun 2017 23:19:04 +0000 (23:19 +0000)]
Merge "Remove Wifi Badges from platform." into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 23:18:07 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev
Bryce Lee [Wed, 7 Jun 2017 23:01:56 +0000 (23:01 +0000)]
Revert "Coordinate configuration changes and window frame size."
This reverts commit
afb45bba8379df530182dae882ec70329423dcfe.
Bug:
32839232
Fixes:
62424393
Change-Id: Ifaa0176e18100ec85b8c81268a26fb16ffe9b5f3
Selim Cinek [Wed, 7 Jun 2017 22:57:54 +0000 (22:57 +0000)]
Merge "Fixed an issue where the qs panel wasn't properly placed" into oc-dr1-dev
Todd Kennedy [Tue, 6 Jun 2017 16:15:46 +0000 (09:15 -0700)]
Passing callingUid to internal methods
Sometimes callers want to clear the calling identity [to avoid permission
calls]. In this case, allow passing the original calling identity to
internal methods.
Test: Manual; create profile account and observe launcher still works cross profile
Test: bit FrameworksServicesTests:com.android.server.pm.ShortcutManagerTest{1..10}
Change-Id: I73f8ad4b2dc1895227c3fcb14f3f1f18f600562f
Fixes:
38349978
Selim Cinek [Wed, 7 Jun 2017 22:51:29 +0000 (15:51 -0700)]
Fixed an issue where the icons had the wrong color
The color of the icons was taken from the ambient view
and wasn't updated when dark changed.
Change-Id: I472e76ff9d4d92500faae5517f10bdeb2658936d
Fixes:
62423352
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/ExpandableNotificationRowTest.java
Sanket Padawe [Wed, 7 Jun 2017 21:50:30 +0000 (21:50 +0000)]
Merge "Update strings for modem restricted state." into oc-dev
am:
58977d1035
Change-Id: I44ee9421ee32c68dd880176f12a89c8ecb3ae03b
Jorim Jaggi [Wed, 7 Jun 2017 21:47:03 +0000 (21:47 +0000)]
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev
am:
fc1753d495
Change-Id: I5cd92b3e08e812f6634f7a8c793b8ac9ef3bcc00
Todd Kennedy [Wed, 7 Jun 2017 21:46:02 +0000 (14:46 -0700)]
expand who can uninstall an instant app
More than just those with the ACCESS_INSTANT_APP
permission should be able to uninstall instant apps.
Any uid that can see instant apps [that includes
the shell and some others] should be able to
uninstall them.
Change-Id: Iea24e5a1cdb369bdf29e7cf5db7977db63faedfc
Fixes:
62406346
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
TreeHugger Robot [Wed, 7 Jun 2017 21:42:33 +0000 (21:42 +0000)]
Merge "Update strings for modem restricted state." into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 21:40:00 +0000 (21:40 +0000)]
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev
Selim Cinek [Wed, 7 Jun 2017 21:03:12 +0000 (21:03 +0000)]
Merge "Fixed a flicker of group notifications" into oc-dev
am:
beba1bf936
Change-Id: I22d44dde99093cbcf10ca8cddb3beccfdc9bdafb
Winson Chung [Wed, 7 Jun 2017 20:57:41 +0000 (20:57 +0000)]
Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev
am:
fd6b3c6da3
Change-Id: Ia156853dacf464f80ea46b35806c1f40d3107ecd
Selim Cinek [Wed, 7 Jun 2017 20:47:47 +0000 (20:47 +0000)]
Merge "Fixed a flicker of group notifications" into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 20:46:15 +0000 (20:46 +0000)]
Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev
Jian Sun [Wed, 7 Jun 2017 20:37:45 +0000 (20:37 +0000)]
Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev
am:
8d5b58a660
Change-Id: Id381a515c44253dc2c3cfa7a74e855fda981580f
Jeff Sharkey [Wed, 7 Jun 2017 20:34:38 +0000 (14:34 -0600)]
Add timeout to StrictMode flash.
Consider an app that requests that a StrictMode border be shown, and
then immediately crashes. We'd end up showing the bars indefinitely,
which is a terrible UX.
This CL enqueues a second message to tear down the bars if nobody
asks for them to be taken down within 1 second.
Test: manual app that crashed after showing violation bars
Bug:
37787765
Change-Id: I45d2078d0dcaa94e8f24087d028f5f06d12c4349
Adrian Roos [Wed, 7 Jun 2017 19:18:05 +0000 (12:18 -0700)]
Keyguard: Increase clock size
Test: observe that keyguard clock looks slightly bigger now
Change-Id: Ic55582abb1cf82bf104afce7d1271e456c78aa1b
Fixes:
62105028
Jian Sun [Wed, 7 Jun 2017 20:31:00 +0000 (20:31 +0000)]
Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev
Bookatz [Wed, 7 Jun 2017 19:30:07 +0000 (12:30 -0700)]
Avoid background getTotalTimeLocked misreporting
It has been discovered that for background values of
AggregatedWakelock, Sync, Job, and partial wakelocks,
the value of getTotalTimeLocked is wrong and often very
negative. getTotalDurationMsLocked, which should provide the exact same
value in all of these cases (since background data is never pooled),
does not have this problem. So while the source of the bug is sought
out, we should use getTotalDurationMsLocked instead of getTotalTimeLocked for
these data.
Bug:
62352334
Test: cts-tradefed run cts-dev -m CtsDumpsysHostTestCases -t android.dumpsys.cts.BatteryStatsDumpsysTest
Change-Id: I78e84368615578483ab8e9e5f0ee1d067491be08
Todd Kennedy [Fri, 2 Jun 2017 14:38:20 +0000 (07:38 -0700)]
Final changes to protect the API surface
This is it. The last set of changes to protect instant apps
from full apps.
Bug:
35871369
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Test: Manual; install instant app and ensure it runs
Change-Id: If71385bcc9a5637590fbd99b0ffcd5ed8809509c
Julia Reynolds [Wed, 7 Jun 2017 20:21:26 +0000 (20:21 +0000)]
Merge "Revert "Change default for group alert behavior"" into oc-dev
am:
6e96251d92
Change-Id: Ie1d25ecf377a023833f29c01f093831f049166fd
Adrian Roos [Fri, 2 Jun 2017 00:55:05 +0000 (17:55 -0700)]
AmbientIndication: Add tap again hint
Adds a hint for tapping the ambient indication again to open.
Also fixes an issue where the indication bottom padding was not correctly
updated if the indication was shown while the panel is collapsed.
Bug:
38387500
Test: tap indication, verify it shows the tap-again-to-open hint. Also verify that if the indication gets set while the phone is unlocked that sufficient space is reserved after transitioning to the lockscreen.
Change-Id: Ie9a152b0bd86807958376fd278ef9502c03af6b2
Julia Reynolds [Wed, 7 Jun 2017 20:12:21 +0000 (20:12 +0000)]
Merge "Revert "Change default for group alert behavior"" into oc-dev
Sundeep Ghuman [Tue, 6 Jun 2017 19:27:25 +0000 (12:27 -0700)]
DO NOT MERGE: Kill Wifi Badging in OC.
Speed labeling is turned on in O-DR hence this CL should not be merged
into master. Using the merged in tag below which implements speed
labeling (ag/
2346102) to prevent this CL from being merged into upstream
branches which need scoring ui.
Merged-In: I0fd96da6a06dafd8c8ebb435a2725ab155bd26ed
Bug: b/
35628911
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: I5740f68be25d5ec297f1f7dc3b3e59203cec2eb5
Doris Liu [Wed, 7 Jun 2017 19:40:53 +0000 (19:40 +0000)]
Merge "Better error message for AVD" into oc-dev
am:
cabf9cdc2e
Change-Id: I6e63b81fd2168780d23a88d7340812b55db98497
Jorim Jaggi [Wed, 7 Jun 2017 19:38:19 +0000 (12:38 -0700)]
Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND
To make sure we won't cause SystemUI to draw the black status bar
background while the starting window is visible.
Test: Warm open chrome
Test: go/wm-smoke
Bug:
38136531
Change-Id: I8dfc0926cafef9d41e78a637523316ac46ce05df
Doris Liu [Wed, 7 Jun 2017 19:31:09 +0000 (19:31 +0000)]
Merge "Better error message for AVD" into oc-dev
Jeff Sharkey [Wed, 7 Jun 2017 19:13:01 +0000 (19:13 +0000)]
Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev
am:
6746aa8c4d
Change-Id: I32f223228c45a4949ebf53c1ab73d20fa9950ed6
Selim Cinek [Fri, 2 Jun 2017 00:36:46 +0000 (17:36 -0700)]
Fixed an issue where the qs panel wasn't properly placed
The QS panel should only be placed below the notifications
if it has notifications above the shelf. This ensures that
all animations including icons are appearing in the right
place.
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/ExpandableNotificationRowTest.java
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/AboveShelfObserverTest.java
Fixes:
35305470
Change-Id: I97fb0c76ed69b7638ce83a7c06856d87bf6bf65f
Etan Cohen [Wed, 7 Jun 2017 00:03:09 +0000 (17:03 -0700)]
[AWARE] Add validity check on PMK/Passphrase lengths
Bug:
62376042
Test: unit tests + inegrated (sl4a) tests
Change-Id: Ib6383a0ba9ef61114eb72b9a04cc683792b8e89d
Jeff Sharkey [Wed, 7 Jun 2017 19:03:54 +0000 (19:03 +0000)]
Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev
Jason Monk [Wed, 7 Jun 2017 17:02:47 +0000 (13:02 -0400)]
Move QS cell indicator back into mobile data tile
Remove it from the header and drop it back in its old location.
This reverts commit
10b4c8a4ab3fc1fd55e5a636066e210ad17cf92b.
Test: runtest systemui
Fixes:
62331189
Change-Id: I087589c256894e0972656619e665b6a16536ce6c
Todd Kennedy [Wed, 7 Jun 2017 18:50:33 +0000 (18:50 +0000)]
Merge "always adjust per-user application info" into oc-dev
am:
91a9d65e42
Change-Id: Ief1ab206a0eb71c9225c000148d0f0b3264a526b
Todd Kennedy [Wed, 7 Jun 2017 18:40:53 +0000 (18:40 +0000)]
Merge "always adjust per-user application info" into oc-dev
Makoto Onuki [Wed, 7 Jun 2017 18:40:46 +0000 (18:40 +0000)]
Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev
am:
28afa23a8f
Change-Id: I3d1079365f13400d1f23f6e61122e00c67432dd1
Makoto Onuki [Wed, 7 Jun 2017 18:33:19 +0000 (18:33 +0000)]
Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev
Selim Cinek [Wed, 7 Jun 2017 18:25:12 +0000 (18:25 +0000)]
Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev
am:
295dd7193e
Change-Id: I1f41744ec2cc5d820e7381858d5974b17db8d893
TreeHugger Robot [Wed, 7 Jun 2017 18:23:11 +0000 (18:23 +0000)]
Merge "Add a WM API to query the touch region for the input method window" into oc-dr1-dev
Selim Cinek [Wed, 7 Jun 2017 18:13:25 +0000 (18:13 +0000)]
Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev
Jason Monk [Wed, 7 Jun 2017 17:28:24 +0000 (17:28 +0000)]
Merge "Make DND tile primary toggle remember favorite zen" into oc-dev
am:
463985178c
Change-Id: I4f1d959c130a008aad49c4aab0aa225bfb035ab3
Jason Monk [Wed, 7 Jun 2017 17:17:43 +0000 (17:17 +0000)]
Merge "Make DND tile primary toggle remember favorite zen" into oc-dev
Sanket Padawe [Tue, 6 Jun 2017 22:12:04 +0000 (15:12 -0700)]
Update strings for modem restricted state.
Test: manual
Bug:
37377132
Change-Id: Iace44143623034c0255d7cceff839a4712972ee2
John Reck [Wed, 7 Jun 2017 16:49:12 +0000 (16:49 +0000)]
Merge "Clear native shader when Paint shader changes" into oc-dev
am:
d3e78478aa
Change-Id: I7d96db34b1894e1064116b830a8fb159ad4c57b0
John Reck [Wed, 7 Jun 2017 16:42:43 +0000 (16:42 +0000)]
Merge "Clear native shader when Paint shader changes" into oc-dev
Albert Chaulk [Mon, 5 Jun 2017 23:35:23 +0000 (19:35 -0400)]
Add a WM API to query the touch region for the input method window
This is needed by VR to handle keyboards that display a window larger
than the interactable region
Bug:
62194867
Test: Manually with prints
Change-Id: I7288956ed8da8d24e7c46ffa8f27461f7abbca5e
(cherry picked from commit
56162a0a51e2aa752a500d941869f1af652eabbf)
Daniel Sandler [Wed, 7 Jun 2017 15:02:00 +0000 (15:02 +0000)]
Merge "Use correct timebase in fg service notifications." into oc-dev
am:
630e7841e5
Change-Id: Idde8d539f4f49bcf171e060d6c6483e375748346
Daniel Sandler [Wed, 7 Jun 2017 14:56:41 +0000 (14:56 +0000)]
Merge "Use correct timebase in fg service notifications." into oc-dev
Julia Reynolds [Wed, 7 Jun 2017 14:12:09 +0000 (14:12 +0000)]
Revert "Change default for group alert behavior"
This reverts commit
8f7828ebe7fc6d87e0de112cfda2823fd5818cb2.
Mutes sound on legacy apps that use their summaries to make sound
Change-Id: I635b1428ee247c0b7753f58343637e64da1c981d
Fixes:
62387153
Wale Ogunwale [Wed, 7 Jun 2017 13:50:25 +0000 (13:50 +0000)]
Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev
am:
7925f817d0
Change-Id: I0b957a0a67a9e245d51dce610acef97d6b72fa04
Wale Ogunwale [Wed, 7 Jun 2017 13:45:02 +0000 (13:45 +0000)]
Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev
Jason Monk [Wed, 7 Jun 2017 13:15:54 +0000 (09:15 -0400)]
Make DND tile primary toggle remember favorite zen
Test: manual
Change-Id: I2b589dbabf4bd7704d4df968ecbd986604e3b757
Fixes:
37794901
Hyunyoung Song [Wed, 7 Jun 2017 09:04:17 +0000 (09:04 +0000)]
Merge "Change Android default icon b/
35314247 Test: manual" into oc-dev
am:
bb4aeb19be
Change-Id: I7a80c68f227d2596f3863b9f234d31a7143ca33c
Michael Wright [Wed, 7 Jun 2017 09:00:53 +0000 (09:00 +0000)]
Merge "Actually wait until the display is ready." into oc-dev
am:
496267f93b
Change-Id: I40d9fb13190db81472cde320cccd9a868ea21516
TreeHugger Robot [Wed, 7 Jun 2017 07:50:14 +0000 (07:50 +0000)]
Merge "Change Android default icon b/
35314247 Test: manual" into oc-dev