OSDN Git Service
TreeHugger Robot [Thu, 6 Jul 2017 18:58:37 +0000 (18:58 +0000)]
Merge "AOD: Fix flicker when unlocking with fingerprint" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 18:35:25 +0000 (18:35 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 18:02:47 +0000 (18:02 +0000)]
Merge "Password field colors" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 17:53:24 +0000 (17:53 +0000)]
Merge "AOD: Skip window animations while dozing" into oc-dr1-dev
Daniel Nishi [Thu, 6 Jul 2017 17:04:59 +0000 (17:04 +0000)]
Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev
Jerry Zhang [Thu, 6 Jul 2017 16:52:04 +0000 (16:52 +0000)]
Merge "Broadcast only if boot complete" into oc-dr1-dev
Adrian Roos [Thu, 6 Jul 2017 16:22:17 +0000 (18:22 +0200)]
AOD: Fix flicker when unlocking with fingerprint
FingerprintUnlockController assumed that not pulsing is the same
as the screen is off. But with AOD this is no longer true. Instead
we now also trigger that flow if the screen is on and dozing.
Change-Id: Iad2fd65c50ad359d50bb357b41c57df123665df2
Fixes:
62885230
Test: Unlock from AOD with fingerprint; ensure that the status bar stays in AOD mode during the transition
TreeHugger Robot [Thu, 6 Jul 2017 16:20:19 +0000 (16:20 +0000)]
Merge "AOD: Disable if device is not yet provisioned" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 16:12:05 +0000 (16:12 +0000)]
Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 16:09:00 +0000 (16:09 +0000)]
Merge "Fix tests?" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 16:01:30 +0000 (16:01 +0000)]
Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 15:34:48 +0000 (15:34 +0000)]
Merge "Don't animate grayscale if animations are off" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 15:23:09 +0000 (15:23 +0000)]
Merge "Fixed an issue where a notification could stay userlocked" into oc-dr1-dev
Lorenzo Colitti [Thu, 6 Jul 2017 15:19:15 +0000 (15:19 +0000)]
Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev
Adrian Roos [Tue, 9 May 2017 20:17:54 +0000 (13:17 -0700)]
AOD: Skip window animations while dozing
Fixes:
37245619
Test: go/wm-smoke; Go to home, turn off phone, observe that during the transition to AOD the navigation bar hide animation does not play.
Change-Id: I9a2fce4295900648a680e8e7e8fee0fbb447dd3d
TreeHugger Robot [Thu, 6 Jul 2017 15:09:10 +0000 (15:09 +0000)]
Merge "Layout updates to share sheet" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 14:32:53 +0000 (14:32 +0000)]
Merge "Fixed an issue where the lockscreen could be all white" into oc-dr1-dev
Jason Monk [Thu, 6 Jul 2017 13:51:47 +0000 (09:51 -0400)]
Fix tests?
Test: runtest systemui
Change-Id: Ie29ff934fbb6eeab977fd2977ea7f3a1d31170e9
Fixes:
63382815
Adrian Roos [Thu, 6 Jul 2017 13:36:32 +0000 (15:36 +0200)]
LockIcon: Initialize mAccessibilityController
Otherwise updating the clickability never happens.
Change-Id: I8a7ec61b25b0862de8cb0122017cf4064b20bcb3
Fixes:
62695092
Test: Disable security. Click on lock icon. Ensure it shows the unlock hint, and does not show that the device has been locked.
Jason Monk [Thu, 6 Jul 2017 13:13:55 +0000 (13:13 +0000)]
Merge "Fix some config issues with sysui" into oc-dr1-dev
Jason Monk [Tue, 27 Jun 2017 22:37:35 +0000 (18:37 -0400)]
Layout updates to share sheet
The biggest change is that padding will only appear above/below
service section, and at the start of the non-service section. For
this a bunch of changes to how padding is needed.
Also some other dimen changes for specs.
Test: visual
Change-Id: I39747701597e620425bdcb4113d1a3585f6de137
Fixes:
37913738
TreeHugger Robot [Thu, 6 Jul 2017 11:30:03 +0000 (11:30 +0000)]
Merge "Zygote: Fix race condition on package preloads." into oc-dr1-dev
Joel Scherpelz [Thu, 8 Jun 2017 06:35:21 +0000 (15:35 +0900)]
Wakeup packet mark/mask configuration option
Rules will only be installed if a device specific config.xml overrides
the default values of mark and mask.
This change also fixes a bug where wakeup rules added by the wakeup
controller would never be removed because updateInterfaces() is not
invoked on wifi network change or disable.
Test: as follows
- built
- flashed
- booted
- Manually verified that mask/mark is set correctly
Bug:
28806131
(cherry picked from commit
668370b9a5d36511f8f2cd58d6c6b0fc1020ee2d)
Change-Id: I95e75b11b973707bcb428ea6498fbfd8e717b855
TreeHugger Robot [Thu, 6 Jul 2017 06:14:00 +0000 (06:14 +0000)]
Merge "Add strings for a "Tethering hardware acceleration" setting." into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 05:47:59 +0000 (05:47 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 05:16:14 +0000 (05:16 +0000)]
Merge "Fix NPE on network forget from details page." into oc-dr1-dev
Erik Kline [Thu, 6 Jul 2017 03:38:48 +0000 (12:38 +0900)]
Clearly log tether_offload_disabled setting status in start()
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
29337859
Bug:
32163131
Change-Id: I312a9309d6934bcec7fc0245cad12b97f1a22521
Winson Chung [Thu, 6 Jul 2017 03:36:47 +0000 (03:36 +0000)]
Merge "Moving check for empty snapshots earlier." into oc-dr1-dev
Winson Chung [Thu, 6 Jul 2017 03:35:50 +0000 (03:35 +0000)]
Merge "Disable auto-enter PIP when launching an assistant activity" into oc-dr1-dev
Sundeep Ghuman [Thu, 6 Jul 2017 03:06:05 +0000 (20:06 -0700)]
Fix NPE on network forget from details page.
Forgetting a network from the wifi network details page throws an NPE in
WifiSettings when the details fragment exits, crashing the app.
Bug: b/
63351286
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: I749ecbda5654ff7a86ffe4c38ca74ebe338923f0
Jack He [Fri, 30 Jun 2017 00:01:23 +0000 (17:01 -0700)]
Bluetooth: Display battery level of connected devices
* Add handler for BluetoothDevice.ACTION_BATTERY_LEVEL_CHANGED intent
* Check battery level information when UI is updated
* Show battery level in Quick Settings connected device summary line
* Show battery level in Bluetooth Settings connected device summary line
* Show battery level in Bluetooth device details page device summary
line
* Add unit test for CachedBluetoothDevice, change HeadsetProfile and
HidProfile to not final to enable mocking
Bug:
35874078
Test: make, unit test, connect to remote devices, connect/disconnect
profiles
Change-Id: I729048cace73aab29337a8002a2897d2acf22fa6
TreeHugger Robot [Thu, 6 Jul 2017 00:49:56 +0000 (00:49 +0000)]
Merge "Update the smearing methods in framework." into oc-dr1-dev
Hiroki Yamamoto [Fri, 14 Apr 2017 06:10:15 +0000 (15:10 +0900)]
Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover
Test: do Nfc Bluetooth Handover and wait for the timeout
Bug:
63250718
Change-Id: Ieea8b8f7a07fe90a594ed13ecfefd01e1d60853d
(cherry picked from commit
506350b6ddf782ec1f35f4b20b2a833d2313eafa)
Bryce Lee [Wed, 5 Jul 2017 23:26:45 +0000 (23:26 +0000)]
Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev
Antony Sargent [Wed, 5 Jul 2017 22:49:11 +0000 (22:49 +0000)]
Merge "Add a convenience method to facilitate tests" into oc-dr1-dev
TreeHugger Robot [Wed, 5 Jul 2017 22:39:37 +0000 (22:39 +0000)]
Merge "Clear calling id before updating MediaStore." into oc-dr1-dev
Daniel Nishi [Tue, 27 Jun 2017 21:38:06 +0000 (14:38 -0700)]
Change visibility on formatPercentage(double).
Bug:
37923610
Test: Manual
Change-Id: I05a2e244a07e737784988a6353841ee55bbdcad0
TreeHugger Robot [Wed, 5 Jul 2017 22:37:32 +0000 (22:37 +0000)]
Merge "Hide VIRTUAL_KEY_RELEASE constant." into oc-dr1-dev
TreeHugger Robot [Wed, 5 Jul 2017 22:17:01 +0000 (22:17 +0000)]
Merge "Adds a new string definition for IMS Access blocked reason" into oc-dr1-dev
Evan Laird [Wed, 5 Jul 2017 21:10:04 +0000 (17:10 -0400)]
Don't animate grayscale if animations are off
Just set the final color instantly on QS icons if animations are off
(battery save mode).
Change-Id: I55a5bd6bab412b9b6a62d32b21adbf7d39cc9e72
Fixes:
62508363
Test: visual
Lucas Dupin [Wed, 5 Jul 2017 20:29:18 +0000 (13:29 -0700)]
Password field colors
Test: Visual. Set light/dark wallpapers, lock/unlock.
Change-Id: I16806512ef983ede22ee13cdeb41f5620cb52888
Fixes:
62590347
Bryce Lee [Wed, 5 Jul 2017 20:52:33 +0000 (20:52 +0000)]
Merge "Ensure all WindowStates are considered before determining all drawn." into oc-dr1-dev
Bryce Lee [Thu, 22 Jun 2017 20:14:28 +0000 (13:14 -0700)]
Use configuration delta to determine if still in orientation change.
We currently track this change in the WindowState with a variable
called mOrientationChanging. This value is set and cleared in a
variety of classes. It is possible for this value to be cleared
before processing an orientation changing frame. This can lead to us
prematurely unfreezing.
Since the orientation is present in the configuration, we can use the
orientation delta between the last and current frame's configuration
to determine whether we are in the middle of an orientation change.
The existing signal has been moved behind a setter/getter where the
latter is combined with the configuration state.
Bug:
62846907
Test: go/wm-smoke
Test: turn launcher rotation on, open dialer in portrait, turn off
screen, rotate to landscape, unlock with fingerprint, press
home while rotating. make sure layout is correct.
Change-Id: Ie0b78b76565125fd1cb036545cfb59f2a9075328
jackqdyulei [Wed, 5 Jul 2017 18:23:33 +0000 (11:23 -0700)]
Update the smearing methods in framework.
1. Fix the bug about foregroundActivityTime. It should take microseconds
as parameter and return microseconds
2. Use the min time of foregroundActivity time and Top time as "screen
time"
3. Hide bluetooth, wifi, idle but don't smear it
Bug:
63176214
Test: runtest -x BatteryStatsHelperTest
Change-Id: I5798577da17d60fb3e3b18351deb31ae77939154
Winson Chung [Wed, 5 Jul 2017 19:23:25 +0000 (12:23 -0700)]
Disable auto-enter PIP when launching an assistant activity
Bug:
36785193
Test: Open auto-enter PiP app, and launch the assistant
Test: go/wm-smoke
Change-Id: I1e43e8738e6a5b92585d2cd5fbb889ee236cf090
Narayan Kamath [Mon, 3 Jul 2017 13:12:26 +0000 (14:12 +0100)]
Zygote: Fix race condition on package preloads.
Before this change, ZygoteProcess.preloadPackageForAbi returned
as soon as the command was written to the zygote socket and not
after the preload completed. This meant that there was a small
window of time before the server side of the socket polled its FDs
where a second command could be written to the zygote socket. This
would lead to only one of the commands being processed and the
other being dropped. The client side of that socket would then wait
forever for a response and bring down the system once the watchdog
timeout was hit.
Example failure case :
--------------
system_server:send command(preloadPackage)
system_server:send command(fork)
zygote:poll & process command(preloadPackage) // the fork command is dropped.
Example of normal operation :
------------------
system_server:send command(preloadPackage)
zygote:poll & process command(preloadPackage)
system_server:send command(fork)
zygote:poll & process command(fork)
This change makes preloadPackageForAbi synchronous, which ensures
that each POLLIN event corresponds to precisely one command.
Bug:
62886909
Bug:
13618569
Test: Manual
Contributed-By: yuqianyu@huawei.com
(cherry-picked from commit
24a3306c32aa3860184025638f3abaab96cc9153)
Change-Id: I83faf974c9a70a6ab18323f692c1981784e4c56a
Jerry Zhang [Thu, 29 Jun 2017 18:11:52 +0000 (11:11 -0700)]
Broadcast only if boot complete
Accessory connects / disconnects can occur before
boot complete, so don't broadcast intents if that
is the case.
Bug:
63114621
Test: connect/disconnect an accessory
Change-Id: Ib8f9eb97ce1630004511fcc1fb84594ccc812c06
TreeHugger Robot [Wed, 5 Jul 2017 17:41:33 +0000 (17:41 +0000)]
Merge "Fix rounded corners fangs in RTL" into oc-dr1-dev
TreeHugger Robot [Wed, 5 Jul 2017 17:39:13 +0000 (17:39 +0000)]
Merge "Updates to brightness mirror to play with color extraction" into oc-dr1-dev
TreeHugger Robot [Wed, 5 Jul 2017 17:36:41 +0000 (17:36 +0000)]
Merge "Fixed the clear all animation on the locked shade" into oc-dr1-dev
TreeHugger Robot [Wed, 5 Jul 2017 17:35:47 +0000 (17:35 +0000)]
Merge "Calling hideKeyguard more often, instead of caching it" into oc-dr1-dev
Jason Monk [Wed, 5 Jul 2017 17:28:20 +0000 (17:28 +0000)]
Merge "Remove UI_MODE_CAR for QS because it isn't doing anything right now." into oc-dr1-dev
TreeHugger Robot [Wed, 5 Jul 2017 17:24:39 +0000 (17:24 +0000)]
Merge "Update power menu + dialog" into oc-dr1-dev
Jason Monk [Wed, 5 Jul 2017 17:04:48 +0000 (17:04 +0000)]
Merge "Tiny visual tweaks to QS" into oc-dr1-dev
Andrew Sapperstein [Wed, 5 Jul 2017 16:56:57 +0000 (16:56 +0000)]
Merge "Use SystemUiContext for immersive mode cling." into oc-dr1-dev
Jason Monk [Wed, 5 Jul 2017 16:20:10 +0000 (12:20 -0400)]
Fix some config issues with sysui
It wasn't creating a delta so as soon as a change happened, it would
return true for any config changes.
Also StatusBar wasn't receiving config changes because the callback
was named wrong and SystemBars no longer passes it through.
Test: manual
Fixes:
62968485
Fixes:
62893293
Change-Id: I56750047168007edd0ca9ea35cb36c23dc790661
Lucas Dupin [Wed, 5 Jul 2017 16:09:49 +0000 (16:09 +0000)]
Merge "Dark text support on Recents" into oc-dr1-dev
Jason Monk [Wed, 5 Jul 2017 15:30:27 +0000 (11:30 -0400)]
Fix rounded corners fangs in RTL
Test: visual in RTL
Change-Id: I918a4de6c3f504d6aa280ca440625273dcbf5a02
Fixes:
62487402
Jason Monk [Wed, 5 Jul 2017 15:10:27 +0000 (11:10 -0400)]
Updates to brightness mirror to play with color extraction
Test: visual
Change-Id: Idfd86fc06b2dab183463963fd4ce32e9a27bf286
Fixes:
63124649
Jason Monk [Wed, 5 Jul 2017 15:15:59 +0000 (11:15 -0400)]
Remove UI_MODE_CAR for QS because it isn't doing anything right now.
Test: make
Fixes:
62597341
Change-Id: I9923982bfefc2604c176eb514d7053b701a09a63
Adrian Roos [Wed, 5 Jul 2017 14:45:42 +0000 (16:45 +0200)]
AOD: Disable if device is not yet provisioned
Change-Id: If1563d9558205936a8c78d1232eb0879700ff6b3
Fixes:
62263216
Test: adb shell settings put user_setup_complete 0; turn off screen; verify AOD does not show
Jason Monk [Wed, 5 Jul 2017 14:26:57 +0000 (10:26 -0400)]
Tiny visual tweaks to QS
Test: visual
Change-Id: If032b940ee8726a2027552da68c46a952d01375c
Fixes:
38199857
Selim Cinek [Wed, 5 Jul 2017 14:22:53 +0000 (16:22 +0200)]
Fixed an issue where the lockscreen could be all white
Especially with always on, this was always triggered when
swiping for voice assist and then locking.
Test: swipe to voice assist with aod, lock with power button
Change-Id: I8a55f08307578e510a30bb97cebff5de8b3a11fa
Fixes:
62995674
Adrian Roos [Wed, 5 Jul 2017 14:09:22 +0000 (16:09 +0200)]
Revert "Default Trust Agents are now always enforced."
This reverts commit
dbece7a45265b8f421415fc9c98ffc8b5a55f6dc.
Test: Disable trust agent in Settings > Security > Trust Agents. Reboot. Verify that trust agent is still disabled.
Change-Id: Id7600798b85debbca21e2f87c3d3d6928494c1cb
Fixes:
37957010
Jason Monk [Thu, 29 Jun 2017 23:37:48 +0000 (19:37 -0400)]
Update power menu + dialog
- Update power menu to handle seascape properly
- Update shutting down dialog, the gradient is covered by the
global actions dialog not going away completely, everything else
is still in ShutdownThread.
Test: visual
Change-Id: I06a2fdd2652bf006dc5c0b45e3bc922e43093301
Fixes:
62391660
Erik Kline [Tue, 4 Jul 2017 04:39:48 +0000 (13:39 +0900)]
Better logging infrastructure in OffloadHardwareInterface
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- watch "adb shell dumpsys connectivity tethering | tail -60" shows logs
Bug:
29337859
Bug:
32163131
Change-Id: Id0bd14e5b364c497403c2d88f7b1c31d712e6f87
Lucas Dupin [Wed, 28 Jun 2017 01:17:40 +0000 (18:17 -0700)]
Dark text support on Recents
Also changed target package.
Test: visual. Set light and dark wallpapers
Change-Id: I188bc21b5372e541509bdd739c825fc5ac53ca47
Fixes:
62346335
Lorenzo Colitti [Tue, 4 Jul 2017 15:28:25 +0000 (00:28 +0900)]
Add strings for a "Tethering hardware acceleration" setting.
Bug:
29337859
Test: builds
Change-Id: I0ee6846df58db15b8ec72d63b629cc56766c999b
Erik Kline [Tue, 4 Jul 2017 13:02:49 +0000 (22:02 +0900)]
Switch to USB_CONFIGURED as the primary USB readiness signal
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- USB tethering on and off works as expected
Bug:
32163131
Bug:
36216864
Bug:
62147658
Bug:
62552150
Change-Id: Ia8f7f3616f1358b0427386ce8aff26899e03ac07
Selim Cinek [Tue, 4 Jul 2017 10:07:55 +0000 (12:07 +0200)]
Fixed the clear all animation on the locked shade
The notifications were also performing a removal animation
even though they were swiped out, which is not needed at all.
Also notifications that were clipped off on the top performed
an animation even though they shouldn't have.
Test: manual, on the shade locked clear all, observe smooth animations
Change-Id: I26c99a1fb48ea7b22e3710a744702af70db32b42
Fixes:
36590278
Selim Cinek [Mon, 3 Jul 2017 12:44:17 +0000 (14:44 +0200)]
Calling hideKeyguard more often, instead of caching it
Because we were caching the Keyguard state, we didn't call
hideKeyguard anymore when going to the shade locked and then
unlocking. As a consequence did we never update the public
mode and therefore remained in a wrong state.
Lot's of bad things could happen with it, for example did
inline reply not work anymore and the clear all button would
be hidden in certain cases. In general would the user not
be properly unlocked.
Test: manual, go to locked shade with redaction turned on, unlock via affordance, observe notifications are unlocked
Fixes:
62721741
Fixes:
62378400
Change-Id: Ibc757859ef26a1dba887e8986d6a2f8f2fe2efb4
TreeHugger Robot [Tue, 4 Jul 2017 05:58:46 +0000 (05:58 +0000)]
Merge "Pass all offload-exempt prefixes into OffloadController" into oc-dr1-dev
Selim Cinek [Mon, 3 Jul 2017 15:05:01 +0000 (17:05 +0200)]
Fixed an issue where a notification could stay userlocked
With the fingerprint gesture a user could get a notification
into a state where it remained userlocked.
We're now not only cancelling the expand helper when the shade
is collapsed but also clearing all userlocked flags.
Test: runtest systemui
Change-Id: Ibf0b29375242daf627ec9b5233a8720a9c01dbf6
Fixes:
63055586
TreeHugger Robot [Mon, 3 Jul 2017 15:07:20 +0000 (15:07 +0000)]
Merge changes from topic 'revert-update-conscrypt' into oc-dr1-dev
* changes:
Revert "Track updates to Conscrypt". DO NOT MERGE ANYWHERE.
Revert "Delete obsolete and unused KeyStoreTests". DO NOT MERGE ANYWHERE.
TreeHugger Robot [Mon, 3 Jul 2017 13:37:33 +0000 (13:37 +0000)]
Merge "Improved Text transformations for notifications" into oc-dr1-dev
TreeHugger Robot [Mon, 3 Jul 2017 12:15:57 +0000 (12:15 +0000)]
Merge "AOD: Avoid double re-registration of sensors" into oc-dr1-dev
Selim Cinek [Mon, 3 Jul 2017 10:46:35 +0000 (10:46 +0000)]
Merge "Fixed an issue where the shelf could be hidden" into oc-dr1-dev
Erik Kline [Sat, 24 Jun 2017 10:29:10 +0000 (19:29 +0900)]
Pass all offload-exempt prefixes into OffloadController
Additionally:
- eliminate useless TetherMasterUtilState
Test: as follows
- built
- flashed
- booted
- runtest frameworks passes
Bug:
29337859
Bug:
32163131
Merged-In: I6adcdbd6a4f14bd2cdaa056cfc0cf9c573a165b9
Merged-In: I5e689bcf5dd048ee9f9bd0c32b16d7c2e4c0268d
Merged-In: Ifd3817bd4569682d77a70f8192432391a573f6d8
Merged-In: I1ea57fbe322e26246f1d8b459519f18be1297467
Change-Id: I0482ac9dd9e8ba558b253643dbc01875ce9475ef
(cherry picked from commit
be8ee08f5dcc3627cac6b0baa6664637684cce35)
Erik Kline [Thu, 29 Jun 2017 02:46:51 +0000 (11:46 +0900)]
Switch IpManager and IpReachabilityMonitor to use SharedLog
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- frameworks/opt/net/wifi/tests/wifitests/runtests.sh passes
- frameworks/base/wifi/tests/runtests.sh passes
- roamed from AP to AP watching IpRM logs accumulate
Bug:
62476366
Bug:
62162774
Change-Id: I155a26259420919eeed74166bacce3311caa49da
Bill Yi [Sat, 1 Jul 2017 16:59:41 +0000 (16:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
c393596c5c -s ours
Change-Id: Idaf923acd47974e468c4793a65535266478467ee
TreeHugger Robot [Sat, 1 Jul 2017 16:49:35 +0000 (16:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Sat, 1 Jul 2017 16:48:37 +0000 (16:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 1 Jul 2017 16:48:03 +0000 (16:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 1 Jul 2017 16:10:37 +0000 (16:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 1 Jul 2017 08:05:57 +0000 (01:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie1d41a529933932afe08bd0a4379a8c39566bba2
Auto-generated-cl: translation import
Bill Yi [Sat, 1 Jul 2017 05:21:21 +0000 (22:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I68c61a6bc5bb8b5ea580383d10702bac0e7db254
Auto-generated-cl: translation import
Bill Yi [Sat, 1 Jul 2017 05:09:25 +0000 (22:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2ec049d1c524feca0bba33fdb21ef03960a50c5a
Auto-generated-cl: translation import
TreeHugger Robot [Sat, 1 Jul 2017 03:39:06 +0000 (03:39 +0000)]
Merge "AOD: Pause FalsingManager prox sensor while showing AOD" into oc-dr1-dev
Myles Watson [Sat, 1 Jul 2017 01:08:56 +0000 (01:08 +0000)]
Send disable messages when Bluetooth is disallowed
am:
6291fae585
Change-Id: I13f4e42ceaab9b1dee41d3a43c0a1a5e8f188fff
Bill Yi [Sat, 1 Jul 2017 00:09:53 +0000 (17:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3e5fd8c8510ef2804f354fd8ffaa3c716daffde7
Auto-generated-cl: translation import
Andrew Sapperstein [Fri, 30 Jun 2017 23:00:43 +0000 (16:00 -0700)]
Use SystemUiContext for immersive mode cling.
Was using teal since the context was not one that should be used
to display UI.
Change-Id: I870c038ab8929af521c8a78b7eac63a400643de0
Fixes:
63151531
Test: manual
Myles Watson [Thu, 29 Jun 2017 10:12:02 +0000 (03:12 -0700)]
Send disable messages when Bluetooth is disallowed
Bug:
63021124
Test: cts-tradefed run commandAndExit cts \
-m CtsDevicePolicyManagerTestCases \
-t com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction
Change-Id: I0ef538a4d0f0632ce303b29595ac1cab3b7d29ce
Brad Ebinger [Fri, 30 Jun 2017 22:34:32 +0000 (15:34 -0700)]
Adds a new string definition for IMS Access blocked reason
When a call is disconnected with the Telephony DisconnectCause
IMS_ACCESS_BLOCKED, DisconnectCause#getReason will now return
the reason REASON_IMS_ACCESS_BLOCKED.
Bug:
33821263
Test: manual tests
Change-Id: Ic17cefa35a51f739c893923a2db7f3dca8ada202
TreeHugger Robot [Fri, 30 Jun 2017 22:31:14 +0000 (22:31 +0000)]
Merge "No smart text assist for unprovisioned device." into oc-dr1-dev
TreeHugger Robot [Fri, 30 Jun 2017 21:37:43 +0000 (21:37 +0000)]
Merge "AOD: Refactor doze brigthness controllers, add AOD auto brightness support" into oc-dr1-dev
Adrian Roos [Fri, 30 Jun 2017 21:22:16 +0000 (21:22 +0000)]
Merge changes Ifa407b84,Iff84c019 into oc-dr1-dev
* changes:
AOD: Add hysteresis to pausing the display
Factor out AlarmTimeout
Garfield Tan [Tue, 27 Jun 2017 18:03:42 +0000 (11:03 -0700)]
Clear calling id before updating MediaStore.
Test: Manual tests.
Bug:
63064166
Change-Id: I87ab9656f699072a6e23249e531805ad7c392764
TreeHugger Robot [Fri, 30 Jun 2017 19:41:46 +0000 (19:41 +0000)]
Merge "Fix use-after-free" into oc-dr1-dev
TreeHugger Robot [Fri, 30 Jun 2017 19:36:52 +0000 (19:36 +0000)]
Merge "Modify docs to clarify EXTRA_LOG_SELF_MANAGED_CALLS behavior." into oc-dr1-dev
TreeHugger Robot [Fri, 30 Jun 2017 19:35:05 +0000 (19:35 +0000)]
Merge changes from topic 'HideMultiUser' into oc-dr1-dev
* changes:
Don't show multi-user in QS unless it has been activated before
QS: Move auto-add state to settings provider