OSDN Git Service
Bill Yi [Tue, 25 Jul 2017 13:48:32 +0000 (06:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9fea258b5d8d3a2dbbad4834d1f5b4bd867ebc2a
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Ajay Panicker [Tue, 25 Jul 2017 02:19:31 +0000 (02:19 +0000)]
Merge "Batterystats handles nested unoptimized ble scans" into oc-dr1-dev
am:
aaf3860941
Change-Id: I627a6da4db6eb09b68e23882ccef2de4c80bf747
Ajay Panicker [Tue, 25 Jul 2017 02:11:26 +0000 (02:11 +0000)]
Merge "Batterystats handles nested unoptimized ble scans" into oc-dr1-dev
Christine Franks [Tue, 25 Jul 2017 01:43:53 +0000 (01:43 +0000)]
Merge "Don't display QS security footer in demo mode" into oc-dr1-dev
am:
ae6776a839
Change-Id: Iace19d7405aae6b47fb33342dc3419921ebf6a5e
Christine Franks [Tue, 25 Jul 2017 01:35:55 +0000 (01:35 +0000)]
Merge "Remove old configuration values for demo mode" into oc-dr1-dev
am:
e1132b4a39
Change-Id: I649457dd844320fbeb3a33d61ce8813aa0967157
Christine Franks [Tue, 25 Jul 2017 01:25:14 +0000 (01:25 +0000)]
Merge "Don't display QS security footer in demo mode" into oc-dr1-dev
Christine Franks [Tue, 25 Jul 2017 01:23:24 +0000 (01:23 +0000)]
Merge "Remove old configuration values for demo mode" into oc-dr1-dev
Kevin Chyn [Tue, 25 Jul 2017 01:22:06 +0000 (01:22 +0000)]
Merge "Default-off FP Swipe" into oc-dr1-dev
am:
76303759c4
Change-Id: I71e8b7288fad93041e0acef5e662b626f8b4f678
Chen Xu [Tue, 25 Jul 2017 01:14:12 +0000 (01:14 +0000)]
Merge "proper cleanup onDestroy" into oc-dr1-dev
am:
c8f40de2dd
Change-Id: Ibf067cbbb041d0f0e79afbe554438d571f9a8d3e
TreeHugger Robot [Tue, 25 Jul 2017 01:03:14 +0000 (01:03 +0000)]
Merge "Default-off FP Swipe" into oc-dr1-dev
Chen Xu [Tue, 25 Jul 2017 01:00:23 +0000 (01:00 +0000)]
Merge "proper cleanup onDestroy" into oc-dr1-dev
Dianne Hackborn [Tue, 25 Jul 2017 00:26:36 +0000 (00:26 +0000)]
Merge "Add activity manager command to watch uid state changes." into oc-mr1-dev
Janis Danisevskis [Tue, 25 Jul 2017 00:11:05 +0000 (00:11 +0000)]
Merge "Refurbish granting mechanism" into oc-dr1-dev
am:
a4a68a1481 -s ours
Change-Id: I44c5504ba34c8b6f16901ac5d70073a3e69871a3
Salvador Martinez [Tue, 25 Jul 2017 00:05:50 +0000 (00:05 +0000)]
Merge "move icon so that inline actions in settings can use it" into oc-dr1-dev
am:
f104b68a04
Change-Id: Id549831e1061088cefd261f460febcb7b3a3cb3f
TreeHugger Robot [Tue, 25 Jul 2017 00:05:30 +0000 (00:05 +0000)]
Merge "Refurbish granting mechanism" into oc-dr1-dev
TreeHugger Robot [Mon, 24 Jul 2017 23:52:28 +0000 (23:52 +0000)]
Merge "move icon so that inline actions in settings can use it" into oc-dr1-dev
Fyodor Kupolov [Mon, 24 Jul 2017 23:23:12 +0000 (23:23 +0000)]
Merge "Handle onUnlockUser on fg thread" into oc-mr1-dev
fionaxu [Sat, 22 Jul 2017 01:02:30 +0000 (18:02 -0700)]
proper cleanup onDestroy
1. interrupt the sleeping testing thread onDestory to avoid
any thread keep running after onDestory.
2. add check of isFinishing() or isDestoryed() when the
testing thread wakeup.
3. detory the webview onDestory since there're chances that
some callbacks in WebChromeClient will try to open dialogs
while the container activity has been destroyed.
Bug:
63819703
Test: Manual test
Change-Id: Ida62d9d8e97e8c9f905ce2feab4ea265575baee8
Bryce Lee [Mon, 24 Jul 2017 22:13:35 +0000 (22:13 +0000)]
Merge "Determine power hint behavior based on target activity." into oc-dr1-dev
am:
b845700dee
Change-Id: Ic2430d0fd6f9a08d2f5aad612c79611adfa7d6b6
Bryce Lee [Mon, 24 Jul 2017 22:07:47 +0000 (22:07 +0000)]
Merge "Determine power hint behavior based on target activity." into oc-dr1-dev
TreeHugger Robot [Mon, 24 Jul 2017 21:23:38 +0000 (21:23 +0000)]
Merge "Update for less arguments in hidl toBinder." into oc-mr1-dev
Matthew Ng [Mon, 24 Jul 2017 21:17:23 +0000 (21:17 +0000)]
Merge "Android Recents implementation for low ram devices" into oc-mr1-dev
Kevin Chyn [Mon, 24 Jul 2017 21:00:22 +0000 (14:00 -0700)]
Default-off FP Swipe
Fixes:
63992836
Test: adb shell settings delete secure system_navigation_keys_enabled
&& make -j RunSettingsRoboTests
Change-Id: I6632c7244749b3b98227cb4392438ab861f3f815
Winson Chung [Mon, 24 Jul 2017 20:32:43 +0000 (20:32 +0000)]
Merge "Fixing occasional jump when launching certain apps from Recents." into oc-dr1-dev
am:
aa5937a366
Change-Id: I75c7bf10c58705dbe26ba60804fc18d1e8257906
Selim Cinek [Mon, 24 Jul 2017 20:26:19 +0000 (20:26 +0000)]
Merge "Fixed an issue where the lock icon could be invisible" into oc-dr1-dev
am:
106b5eefd2
Change-Id: Ic55a8e7a4a59dcad2b0472f9906fe4393313b5f9
Winson Chung [Mon, 24 Jul 2017 20:25:07 +0000 (20:25 +0000)]
Merge "Fixing occasional jump when launching certain apps from Recents." into oc-dr1-dev
TreeHugger Robot [Mon, 24 Jul 2017 20:21:15 +0000 (20:21 +0000)]
Merge "Don't create WindowNode on windows with dettached view." into oc-mr1-dev
Selim Cinek [Mon, 24 Jul 2017 20:19:30 +0000 (20:19 +0000)]
Merge "Fixed an issue where the lock icon could be invisible" into oc-dr1-dev
Felipe Leme [Mon, 24 Jul 2017 20:18:53 +0000 (20:18 +0000)]
Merge "DO NOT MERGE - Don't 'cmd vibrate' when on DND mode." into oc-dr1-dev
am:
9874ab69e5
Change-Id: I9dfeacca337dc93c39bc5c964b596655f2a7a0de
Robert Carr [Mon, 24 Jul 2017 20:13:47 +0000 (20:13 +0000)]
Merge "Ignore "mLastHidden" state when deciding whether to turnScreenOn." into oc-dr1-dev
am:
cf3b6afe01
Change-Id: Ibadb8f4808060e3d25fc93da5593abfcf819191b
TreeHugger Robot [Mon, 24 Jul 2017 20:08:31 +0000 (20:08 +0000)]
Merge "DO NOT MERGE - Don't 'cmd vibrate' when on DND mode." into oc-dr1-dev
Salvador Martinez [Sat, 22 Jul 2017 18:03:22 +0000 (11:03 -0700)]
move icon so that inline actions in settings can use it
Test: tests still pass
Bug:
62022517
Change-Id: Ifc01797c6ada51130586b5b42570c3357923ef85
TreeHugger Robot [Mon, 24 Jul 2017 20:04:02 +0000 (20:04 +0000)]
Merge "Ignore "mLastHidden" state when deciding whether to turnScreenOn." into oc-dr1-dev
Fyodor Kupolov [Fri, 14 Jul 2017 18:39:52 +0000 (11:39 -0700)]
Handle onUnlockUser on fg thread
AppWidgetService.onUserUnlocked can block ActivityManager thread
for 500+ ms. The code is guarded by mLock, so it's safe to simply
offload it to the worker thread without additional synchronization.
Test: Setup widgets/rebooted the device and unlocked
Test: Create/switch to guest user + setup widgets
Bug:
63389529
Change-Id: Ib3bc76f79bdbc707c0ac270d7fc35c8b27af9af0
Andrii Kulian [Mon, 24 Jul 2017 18:42:25 +0000 (18:42 +0000)]
Merge "DO NOT MERGE Add permission to launch activities on VD" into oc-mr1-dev
Janis Danisevskis [Fri, 9 Jun 2017 00:53:34 +0000 (17:53 -0700)]
Refurbish granting mechanism
Keystore stores key blobs in with filenames that include the symbolic
name and the uid of the owner. This behaviour should have been
completely opaque to the user keystore. However, the granting mechanism,
by which an app can allow another app to use one of its keys, leaked the
internal structure in that the grantee had to specify the key name with
the granter's uid prefix in order to use the granted key. This in turn
collided with prefix handling in other parts of the framework.
This patch refurbishes the granting mechanism such that keystore can
choose a name for the grant. It uses the original symbolic key name as
prefix and appends _KEYSTOREGRANT_<grant_no> where the grant_no is
chosen as first free slot starting from 0. Each uid has its own grant_no
space.
This changes the grant call such that it now returns a string, which is
the alias name of the newly created grant. The string is empty if the
grant operation failed.
As before apps can still mask granted keys by importing a key with the
exact same name including the added suffix. But everybody deserves the
right to shoot themselves in the foot if they really want to.
Bug:
37264540
Bug:
62237038
Test: run cts-dev --module CtsDevicePolicyManagerTestCases --test
com.android.cts.devicepolicy.DeviceOwnerTest#testKeyManagement
because it grants a key
Merged-In: I047512ba345c25e6e691e78f7a37fc3f97b95d32
Change-Id: I047512ba345c25e6e691e78f7a37fc3f97b95d32
Makoto Onuki [Mon, 24 Jul 2017 17:42:31 +0000 (17:42 +0000)]
Merge "Don't keep parceled extras for history broadcasts." into oc-mr1-dev
Michael Wright [Mon, 24 Jul 2017 15:24:22 +0000 (15:24 +0000)]
Merge "Use new, lower brightness value for low brightness doze." into oc-dr1-dev
am:
f5c3922645
Change-Id: Icffd015c285e10255c2404fb9eeefaa6c63b230c
TreeHugger Robot [Mon, 24 Jul 2017 15:16:24 +0000 (15:16 +0000)]
Merge "Use new, lower brightness value for low brightness doze." into oc-dr1-dev
Christine Franks [Mon, 24 Jul 2017 14:47:05 +0000 (14:47 +0000)]
Merge "Remove reference to com.android.retaildemo" into oc-dr1-dev
am:
173e721ab6
Change-Id: I9937a58fffdbeefd9a6aace84dd977c2fe22aa09
Christine Franks [Mon, 24 Jul 2017 14:33:46 +0000 (14:33 +0000)]
Merge "Remove reference to com.android.retaildemo" into oc-dr1-dev
Jorim Jaggi [Mon, 24 Jul 2017 14:14:34 +0000 (14:14 +0000)]
Revert "Fix jank when switching themes"
am:
6498f96283
Change-Id: Ie5813f1c04a6db9d5ee291df764873900add5064
Jorim Jaggi [Mon, 24 Jul 2017 13:51:41 +0000 (15:51 +0200)]
Revert "Fix jank when switching themes"
This reverts commit
e5d0b9dddbcd8e6be7725a89b82fb990db2dade7.
Fixes crashloop with lock pattern
Change-Id: I3721444c91e2be625c59ec3e6ba14f1080badc07
Fixes:
63980375
Michael Wright [Mon, 24 Jul 2017 12:52:43 +0000 (12:52 +0000)]
Merge "Remove non-safe mode boot vibration." into oc-dr1-dev
am:
149ff697ff
Change-Id: Ie8964116ffb3dccd6b683f0fff764d128107ac4f
TreeHugger Robot [Mon, 24 Jul 2017 12:46:25 +0000 (12:46 +0000)]
Merge "Remove non-safe mode boot vibration." into oc-dr1-dev
Selim Cinek [Sun, 23 Jul 2017 12:57:19 +0000 (12:57 +0000)]
Merge "Removing contents hidden string for public notifications" into oc-dr1-dev
am:
8650c7c0f1
Change-Id: I10d7ab191f47bf167a5be5e0d11d7698aae58cd1
TreeHugger Robot [Sun, 23 Jul 2017 12:51:43 +0000 (12:51 +0000)]
Merge "Removing contents hidden string for public notifications" into oc-dr1-dev
Android Build Merger (Role) [Sat, 22 Jul 2017 17:10:31 +0000 (17:10 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
51e35963ae -s ours" into oc-mr1-dev
Bill Yi [Sat, 22 Jul 2017 17:09:06 +0000 (17:09 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
51e35963ae -s ours
Change-Id: I54774e5f20216a738ba315f5fdaaac6e6f89c60a
TreeHugger Robot [Sat, 22 Jul 2017 17:09:04 +0000 (17:09 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 22 Jul 2017 17:02:45 +0000 (17:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 22 Jul 2017 16:55:48 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 22 Jul 2017 16:55:05 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 22 Jul 2017 16:39:09 +0000 (16:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
69e41a4e9c -s ours
Change-Id: I9ee8162c0015297eee31e5254ee9347f92cbdc5c
TreeHugger Robot [Sat, 22 Jul 2017 16:31:16 +0000 (16:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 22 Jul 2017 16:27:38 +0000 (16:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
86817456ff -s ours
Change-Id: I44c91d899d1718557316d1f9bec1d87613d47fbd
TreeHugger Robot [Sat, 22 Jul 2017 16:21:57 +0000 (16:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 22 Jul 2017 09:47:35 +0000 (02:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1670c714954e5835f6c79f446c463ee18d72d17b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 22 Jul 2017 09:42:31 +0000 (02:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifa292630f4aba2e8129bfb6e0bc5de3fcad5d6fb
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 22 Jul 2017 06:43:49 +0000 (23:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ida215c44df2fd5572b046d426bca7304947398bc
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 22 Jul 2017 06:28:53 +0000 (23:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icbe8f5431d45b87a584b611ce2c8569fd830d9f9
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Lucas Dupin [Sat, 22 Jul 2017 04:52:31 +0000 (04:52 +0000)]
Merge "Fix jank when switching themes" into oc-dr1-dev
am:
a74f575ff9
Change-Id: Ibc8fa59cfa6139b03aa7fb08361eb43331484be5
TreeHugger Robot [Sat, 22 Jul 2017 04:46:19 +0000 (04:46 +0000)]
Merge "Fix jank when switching themes" into oc-dr1-dev
Bill Yi [Sat, 22 Jul 2017 03:58:50 +0000 (20:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8c164681df192fe74083e69adf301a0f312dc144
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 22 Jul 2017 03:42:48 +0000 (20:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibde0d25cf7cd630ac63d57c865e906a28739d48a
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Matthew Fritze [Sat, 22 Jul 2017 03:37:46 +0000 (03:37 +0000)]
Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev
am:
1cc73a5773
Change-Id: Iebb70bf9db4c3eabf0aecd07a0ecf9178ff8944b
TreeHugger Robot [Sat, 22 Jul 2017 03:31:53 +0000 (03:31 +0000)]
Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev
TreeHugger Robot [Sat, 22 Jul 2017 03:01:02 +0000 (03:01 +0000)]
Merge "Expose shared buffer mode/auto refresh on Surface" into oc-mr1-dev
Christine Franks [Tue, 27 Jun 2017 23:46:26 +0000 (16:46 -0700)]
Remove reference to com.android.retaildemo
Bug:
62712426
Test: runtest -c UserManagerTest frameworks-services
Change-Id: I26ca7e7dbf4ea44d2cb4a173072eac0037d75eca
TreeHugger Robot [Sat, 22 Jul 2017 01:07:36 +0000 (01:07 +0000)]
Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-mr1-dev
Christine Franks [Wed, 19 Jul 2017 14:46:34 +0000 (07:46 -0700)]
Remove old configuration values for demo mode
Bug:
62712426
Test: make -j100
Change-Id: Ibe8a89208ba93d7074800f087798678371f72fb8
Makoto Onuki [Sat, 22 Jul 2017 00:57:59 +0000 (00:57 +0000)]
Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev
am:
5bbf44e715
Change-Id: Icb54710f8a76f674c75c79e9992eb03264ff3142
TreeHugger Robot [Sat, 22 Jul 2017 00:45:24 +0000 (00:45 +0000)]
Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev
Bookatz [Sat, 22 Jul 2017 00:41:57 +0000 (00:41 +0000)]
Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev
am:
2337b3ba84
Change-Id: Ie29e6ddb7ab37977130adbf566fac18c4dc5c26b
Matthew Fritze [Sat, 22 Jul 2017 00:33:00 +0000 (17:33 -0700)]
Move icon resources into SettingsLib for phone buddy
The external settings api needs to pass icons for
corresponding settings. The following signals didn't have
icons in Settings.
- Night display
- Location
Bug:
62706782
Test: make RunSettingsGoogleRoboTests
Change-Id: Ia2feaa9cfea7dbce165545e5b7d96ad0798b8e07
TreeHugger Robot [Sat, 22 Jul 2017 00:35:10 +0000 (00:35 +0000)]
Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev
Dianne Hackborn [Mon, 10 Jul 2017 16:22:32 +0000 (17:22 +0100)]
Add activity manager command to watch uid state changes.
Also fix a few issues in uid reporting: active was being
reported multiple times when a process started, and idle
could be reported before the idle delay actually happened.
Test: manual, will be adding cts using the new cmd
Change-Id: I16d6dc3991350f36b04db434eaa4aa2655966db6
Wyatt Riley [Sat, 22 Jul 2017 00:18:53 +0000 (00:18 +0000)]
Merge "Fix RemoteListenerHelper vs. HAL deadlock" into oc-dr1-dev
am:
ec996b381d
Change-Id: I345871c43857d1d0e01377a50e9745ce3c598955
Selim Cinek [Sat, 22 Jul 2017 00:16:05 +0000 (17:16 -0700)]
Fixed an issue where the lock icon could be invisible
Because the state wasn't properly initialized after reinflation,
the lockicon could be invisible.
This also fixes an issue where we were leaking the view after reinflation.
Change-Id: Ic01e488319d8650fac07c35642a4bba62311c1e8
Fixes:
62411136
Test: manual, switch user twice, observe
TreeHugger Robot [Sat, 22 Jul 2017 00:12:10 +0000 (00:12 +0000)]
Merge "Fix RemoteListenerHelper vs. HAL deadlock" into oc-dr1-dev
David Friedman [Fri, 21 Jul 2017 23:57:01 +0000 (23:57 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev am:
e4d0557334
am:
f20c492190
Change-Id: I57da50e47d3fdfefa245baffdeaf16322b28fa30
Fan Zhang [Fri, 21 Jul 2017 23:55:17 +0000 (23:55 +0000)]
Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-dr1-dev
am:
689359914d -s ours
Change-Id: I0193cc14eecb868b4bc4f47fe10d07aa4e787a5c
Makoto Onuki [Wed, 31 May 2017 23:20:21 +0000 (16:20 -0700)]
Don't keep parceled extras for history broadcasts.
On dumpsys we do show history broadcast intents with extras, but
if an intent's extras are still parceled, we can't show anything
(but the length) anyway, so let's just remove them, because sometimes
they contain heavy objects such as bitmaps.
Bug:
62144301
Test: manual tests: Boot, add account start apps, insert SIM
Change-Id: Ia64dd46d66fba3098e32c435509f4940ae978710
Andrii Kulian [Fri, 21 Jul 2017 23:16:24 +0000 (23:16 +0000)]
Merge changes from topic 'activity_view_v2-oc-mr1-dev' into oc-mr1-dev
* changes:
DO NOT MERGE VirtualDisplay wrapper with input forwarding
DO NOT MERGE ActivityView be gone!
Romain Guy [Thu, 20 Jul 2017 15:57:07 +0000 (08:57 -0700)]
Expose shared buffer mode/auto refresh on Surface
These features can be set on a surface to reduce perceived latency
at the expense of visible tearing.
Bug:
63858546
Test: Manual, CTS test coming
Change-Id: Ica3f480bd1cb8f77dff57218d2fa8783433d3396
David Friedman [Fri, 21 Jul 2017 23:11:16 +0000 (23:11 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev
am:
e4d0557334
Change-Id: I931088e43f29707e1ab5d9764a06adbbe5af1d7e
David Friedman [Fri, 21 Jul 2017 23:01:56 +0000 (23:01 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev
TreeHugger Robot [Fri, 21 Jul 2017 22:59:13 +0000 (22:59 +0000)]
Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-dr1-dev
Makoto Onuki [Fri, 21 Jul 2017 22:30:35 +0000 (15:30 -0700)]
Persist/pacel # of periodic syncs properly.
(Note it shouldn't be persisting parceled data in the first place. There's
already a bug filed for that.)
Bug
63935632
Test: manaul test
Change-Id: I5385caa6cd0663c7e13db0256b2c1027abe6c3a1
Bookatz [Fri, 21 Jul 2017 16:03:23 +0000 (09:03 -0700)]
Batterystats: fix inappropriate bg timebase reset
Previously, the background timebases (of a Uid) were reset when the Uid
resets in the wrong place. This caused StopwatchTimer.reset() to have the timesbase's old value to keep
track of its mUpdateTime. The solution is to call TimeBase.init at the
start of Uid.reset(), instead of calling TimeBase.reset() at the end of
Uid.reset().
Bug:
62352334
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
Change-Id: I23c886544e18f154fc226cc81c22c3ea70fb4c7e
Fan Zhang [Fri, 21 Jul 2017 17:21:36 +0000 (10:21 -0700)]
Fix suggestion crash if parser fails to parse dismiss rule
We store a index value in shared pref to figure out when a suggestion
should be displayed next time. However the rule can change due to
various reasons. When the index and the rule itself go out of sync, we
should not crash.
Change-Id: Id3ea88b6d321434e20ac0cd3e2670524c237e24e
Bug:
63908636
Test: robotests
(cherry picked from commit
4d37a1a1e1ca902b8a65bce64fafa0eeea51a4dd)
TreeHugger Robot [Fri, 21 Jul 2017 21:53:26 +0000 (21:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 21:51:23 +0000 (21:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bryce Lee [Fri, 21 Jul 2017 20:25:13 +0000 (13:25 -0700)]
Determine power hint behavior based on target activity.
Previously, logic was added surrounding whether to trigger a power
hint based on the start activity. However, this activity is not
always relevant in the calling context.
This change adjusts the logic by passing the target activity into
the method.
Fixes:
63913311
Test: press home button while on home and ensure power hint not
triggered.
Change-Id: I71ffcae7adbc2c55ef5b2994f4c55688d0aa0ca5
Wyatt Riley [Mon, 3 Jul 2017 22:14:42 +0000 (15:14 -0700)]
Fix RemoteListenerHelper vs. HAL deadlock
Releasing lock before calling into HAL.
Fixes:
62776535
Bug:
63264577
Test: Build, GNSS location & GnssMeasurement toggling
Reproed issue with test sleep code without fix and passed with.
Change-Id: I44e183e98edd972619a068bbcc95468e9a9cdee1
Bookatz [Tue, 11 Jul 2017 23:49:17 +0000 (16:49 -0700)]
Batterystats handles nested unoptimized ble scans
When a ble scan starts, it tells batterystats whether that scan is
unoptimized. When the scan stops, batterystats is not informed of
whether the stopped scan was unoptimized. Because the ble scan call
could not be nested (couldn't call start twice without stopping first),
this was fine, but now nesting is possible, so batterystats needs to
know whether the stopped ble scan is unoptimized.
Bug:
63456783
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
Test: no new errors when run cts-dev -m CtsIncidentHostTestCases -t com.android.server.cts.BatteryStatsValidationTest#testUnoptimizedBleScans
Change-Id: Ia73f294cf1807ddaf20f1c0bcc28add001cac78c
Christine Franks [Wed, 19 Jul 2017 01:12:31 +0000 (18:12 -0700)]
Don't display QS security footer in demo mode
Bug:
63843869
Test: runtest systemui
Change-Id: I50e408749262b33644c5c007cd1f78138e1d5c3b
Dake Gu [Fri, 21 Jul 2017 20:55:26 +0000 (20:55 +0000)]
Merge "Initial commit of leanback uibench test" into oc-mr1-dev
Evan Laird [Fri, 21 Jul 2017 20:33:04 +0000 (20:33 +0000)]
Merge "Update icons in the volume rocker" into oc-dr1-dev
am:
cdcbbeccb7
Change-Id: Ibd7685290847f651406d5961faa9a9182b859af5
TreeHugger Robot [Fri, 21 Jul 2017 20:25:09 +0000 (20:25 +0000)]
Merge "Update icons in the volume rocker" into oc-dr1-dev