OSDN Git Service
Evan Laird [Wed, 28 Jun 2017 22:00:02 +0000 (18:00 -0400)]
resolve merge conflicts of
91870d158748 to oc-dr1-dev
Test: mp sysuig; visual
Change-Id: Id329cd7f08667b29e8d430cff6576d8894cd9cf4
Evan Laird [Wed, 28 Jun 2017 21:30:15 +0000 (21:30 +0000)]
Merge "Fix empty signal line thickness / color in status bar" into oc-dev
Charlie Wang [Wed, 28 Jun 2017 21:26:38 +0000 (21:26 +0000)]
Merge "Adding fields for time elapsed for headset device events." into oc-dr1-dev
Alison Cichowlas [Wed, 28 Jun 2017 21:23:49 +0000 (21:23 +0000)]
Merge "This import got lost in the merge. Restore to fix build." into oc-dr1-dev
Phil Weaver [Wed, 28 Jun 2017 21:17:42 +0000 (21:17 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev
am:
bb8a7983ff
Change-Id: I0e796089c9768ddd8de1c371f0511d7967833e9d
Jason Monk [Wed, 28 Jun 2017 21:14:43 +0000 (21:14 +0000)]
Merge "NavBar: Don't reorient as much, its a waste of work" into oc-dr1-dev
Phil Weaver [Wed, 28 Jun 2017 21:09:03 +0000 (21:09 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev
Brad Ebinger [Wed, 28 Jun 2017 21:06:34 +0000 (21:06 +0000)]
Merge "IMS: Check for binderstate before calling endSession" into oc-dr1-dev
Alison Cichowlas [Wed, 28 Jun 2017 20:42:09 +0000 (16:42 -0400)]
This import got lost in the merge. Restore to fix build.
Test: built
Change-Id: Iba7e4449ed8ddfb535a45f087e3baf43b52a5f08
Brad Ebinger [Tue, 27 Jun 2017 17:08:55 +0000 (17:08 +0000)]
IMS: Check for binderstate before calling endSession
ImsRegistrationListenerProxy listener, which is registered
as part of ImsManager.open, is not cleared even after moving
feature state to NOT_AVAILABLE because end session
is never called.
Check for binder state instead of feature state READY before
calling end session. End session will be triggered after
moving feature state to NOT_AVAILABLE.
Notify Ims state change only for the supported feature state
change to clients.
Test: Manual
Bug:
62816014
Merged-In: Idfb6dfad51cca574c2ae25e2029ef7bdfe9d725b
Change-Id: Idfb6dfad51cca574c2ae25e2029ef7bdfe9d725b
(cherry picked from commit
913e11fcdfc9cbd7fd3eee1c94d1cb3fced37da9)
Alison Cichowlas [Wed, 28 Jun 2017 20:08:21 +0000 (20:08 +0000)]
Merge "Disable failing RoundedCornersTest" into oc-dr1-dev
Andrii Kulian [Wed, 28 Jun 2017 19:56:33 +0000 (19:56 +0000)]
Merge "Restrict launching activities on virtual displays" into oc-dev
am:
b0c5d67bf1
Change-Id: Ic2361cab5ee66552f7d1714cfca0cc320c02ed30
Andrii Kulian [Wed, 28 Jun 2017 19:50:27 +0000 (19:50 +0000)]
Merge "Restrict launching activities on virtual displays" into oc-dev
Alison Cichowlas [Wed, 28 Jun 2017 19:12:50 +0000 (19:12 +0000)]
Merge "Revert "Hide power dialog when lockscreen comes and goes."" into oc-dr1-dev
Alison Cichowlas [Wed, 28 Jun 2017 18:49:21 +0000 (14:49 -0400)]
Disable failing RoundedCornersTest
Bug:
63098063
Test: literally just test changes
Change-Id: Ibde220ccc049baa56f76c385543f97b241b4dc30
Lucas Dupin [Wed, 28 Jun 2017 18:34:28 +0000 (18:34 +0000)]
Merge changes from topic 'theme_overlay_sysui' into oc-dr1-dev
* changes:
Support dark text on Recents
Replaced overlay target package
Evan Laird [Wed, 28 Jun 2017 18:27:47 +0000 (14:27 -0400)]
Fix empty signal line thickness / color in status bar
Parameterize the line thickness to the height of the drawable. Also draw
the empty state as background signal instead of foreground.
Test: visual
Change-Id: I39a7ef3164b784008e3dba5284b7fe83e4666607
Fixes:
63097113
Mady Mellor [Wed, 28 Jun 2017 18:10:07 +0000 (18:10 +0000)]
If the menu hasn't been created yet don't do things with it
am:
104be2e019
Change-Id: I6bf4197736f6a6c6760ac091a2ca71402e44dec8
Jason Monk [Wed, 28 Jun 2017 18:03:24 +0000 (18:03 +0000)]
Merge "Shrink the nav buttons some" into oc-dr1-dev
Jason Monk [Wed, 28 Jun 2017 18:01:17 +0000 (18:01 +0000)]
Merge "Enable "Reboot to safe mode" confirmation on GlobalActions" into oc-dr1-dev
Lei Yu [Wed, 28 Jun 2017 17:55:04 +0000 (17:55 +0000)]
Merge "Add API to RuntimePermissionPresenter" into oc-dr1-dev
Phil Weaver [Wed, 28 Jun 2017 16:46:32 +0000 (09:46 -0700)]
Don't break key event stream when enabling a11y
Bug:
62862624
Test: Enable magnification, then enable TalkBack with the
a11y shortcut. Verify that volume keys work.
A11y service CTS, a11y units tests.
Change-Id: I729ab17d24f758b5ce534ffde43d2126a1f9536c
Jeff Davidson [Wed, 28 Jun 2017 17:23:49 +0000 (17:23 +0000)]
Merge "Add EuiccManager#retainSubscriptionsOnFactoryReset API." into oc-dr1-dev
Jason Monk [Wed, 28 Jun 2017 17:18:33 +0000 (13:18 -0400)]
NavBar: Don't reorient as much, its a waste of work
Test: runtest systemui
Change-Id: Iea9955fb48bc7f2a3da772af34109d972e11e7d7
Fixes:
62620242
Alison Cichowlas [Wed, 28 Jun 2017 14:58:05 +0000 (14:58 +0000)]
Revert "Hide power dialog when lockscreen comes and goes."
This reverts commit
0a2026430e789d5a7ddd837d6091b26bb190ac69.
Bug:
63092414,
37434614
Change-Id: I6b3e190b5107e0516ade0c93b586dfbdde00c9c1
Andrii Kulian [Wed, 28 Jun 2017 16:42:48 +0000 (09:42 -0700)]
Restrict launching activities on virtual displays
If an app creates a Surface and a virtual display backed by that
Surface, it can then launch activities and hijack their content.
This CL restrict activities that can be launched to virtual displays
created by apps only to those who set "allowEmbedded" attribute.
If a virtual display was created by system, apps won't get access to
the surface, so we're not limiting in this case.
Bug:
63094482
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testLaunchNotEmbeddedOnVirtualDisplay
Change-Id: Ied216bdf33df4b5a6cc8cac0e006a4883a36f94f
Ying Xu [Wed, 28 Jun 2017 16:47:50 +0000 (16:47 +0000)]
Merge "Use Bundle for inter-process message" into oc-dr1-dev
Mady Mellor [Wed, 21 Jun 2017 00:18:53 +0000 (17:18 -0700)]
If the menu hasn't been created yet don't do things with it
Test: runtest systemui
Fixes:
62594598
Change-Id: I1050e2b2bf1ece960d19ad13cb6a9bf71512db57
(cherry picked from commit
0b3f004acbb0eef38ee5e8d920e934f7ab2f7cde)
Shunta Sato [Fri, 14 Apr 2017 07:01:54 +0000 (16:01 +0900)]
Enable "Reboot to safe mode" confirmation on GlobalActions
Android N or prior GlobalActions showed "Reboot to safe mode",
when user do long-press of "power off" button on GlobalActions.
Currently, no confirmation dialog is shown. It's not user friendly.
This commit make it enable again.
- Also dismiss global actions on long press.
Test: manual
Bug:
37333890
Change-Id: I3bfefff3cd34ba35b003281e94a4181cebb74fcf
TreeHugger Robot [Wed, 28 Jun 2017 15:27:02 +0000 (15:27 +0000)]
Merge "AOD: Proximity check doze triggers" into oc-dr1-dev
Bill Yi [Wed, 28 Jun 2017 15:21:46 +0000 (15:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
f36a995424 -s ours
Change-Id: Icf392e8e462ed9bb42b9b8b67850ab702078e559
TreeHugger Robot [Wed, 28 Jun 2017 15:11:54 +0000 (15:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Jason Monk [Wed, 28 Jun 2017 14:45:13 +0000 (10:45 -0400)]
Shrink the nav buttons some
Test: visual
Bug:
37115488
Change-Id: Ie013f1644ac9782c10000dc4e4019d99c91680f8
TreeHugger Robot [Wed, 28 Jun 2017 14:30:47 +0000 (14:30 +0000)]
Merge changes I66f2c52b,I95f72c9d into oc-dr1-dev
* changes:
Fixed the accessibility of the reply button
Avoiding weird icon positions
Jason Monk [Wed, 28 Jun 2017 13:37:51 +0000 (13:37 +0000)]
Merge "Add system to avoid a crash stopping tests from running" into oc-dr1-dev
Jason Monk [Wed, 28 Jun 2017 13:26:42 +0000 (13:26 +0000)]
Merge "Fix a11y volume not always being shown" into oc-dr1-dev
Jason Monk [Wed, 28 Jun 2017 13:15:54 +0000 (13:15 +0000)]
Merge "Add plugin to swap out recents" into oc-dr1-dev
TreeHugger Robot [Wed, 28 Jun 2017 13:06:58 +0000 (13:06 +0000)]
Merge "Limit when a ranking reconsidering can alert" into oc-dr1-dev
Selim Cinek [Wed, 28 Jun 2017 12:17:22 +0000 (14:17 +0200)]
Fixed the accessibility of the reply button
The new button didn't have a content description before
and could therefore not be read.
Change-Id: I66f2c52b50494f7347d5beebc44c7d4fecfd33b2
Fixes:
62639422
Test: manual add reply notification, observe talkback
Selim Cinek [Fri, 9 Jun 2017 02:11:50 +0000 (19:11 -0700)]
Avoiding weird icon positions
When expanding quickly we switch to a linear interpolation.
In this case the last icon may be stuck in between the
shelf position and the notification position, which looks pretty bad.
We therefore optimize this case better to avoid these weird
in-between cases.
Test: manual, expand with various notifications
Fixes:
63088105
Fixes:
62374617
Change-Id: I95f72c9defc6c941a5a6a71829d239529c3861e9
TreeHugger Robot [Wed, 28 Jun 2017 05:11:28 +0000 (05:11 +0000)]
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." into oc-dr1-dev
Jean-Michel Trivi [Wed, 28 Jun 2017 03:16:51 +0000 (03:16 +0000)]
Merge "AudioService: internal API for disabling audio playback for a UID" into oc-dr1-dev
Lucas Dupin [Wed, 28 Jun 2017 01:17:40 +0000 (18:17 -0700)]
Support dark text on Recents
Test: visual. Set light and dark wallpapers
Change-Id: I100c7d6dac066168636b1741ed1ed7fc309988ef
Fixes:
63080632
Lucas Dupin [Wed, 28 Jun 2017 00:02:02 +0000 (17:02 -0700)]
Replaced overlay target package
Changing from android to com.android.systemui
will keep it from showing up in the settings app.
Bug:
62346335
Bug:
62739503
Test: manual
Change-Id: Ie8864d4508f229f83aec58380136549f3e4fb759
Jean-Michel Trivi [Tue, 27 Jun 2017 02:32:38 +0000 (19:32 -0700)]
AudioService: internal API for disabling audio playback for a UID
Internal API, available through AudioManagerInternal, to flag
a UID as having lost the ability to play audio. When that
happens, all players associated with this UID are paused, and
future players are immediately paused when they report they
started.
Users of this API must "enable" a previously banned UID when
it is no longer in use.
Test: upcoming manual test with background apps
Bug:
34471029
Change-Id: Ic1c103aabe8f3897072b3ce938d84cb949540e23
pkanwar [Mon, 22 May 2017 22:23:38 +0000 (15:23 -0700)]
Radio Interface changes to pass the encryption object, including the
key,to the modem.
We will now pass the ImsiEncryptionInfo object which includes mnc/mcc.
BUG:
35606429
Test: manual
(cherry picked from commit
6d50fec388cf382a1f0a4886fe5cea16280f5bdf)
Merged-In: Idf835d9b99a26cb0c0d73fb70ffa9875843ac62b
Change-Id: Idf835d9b99a26cb0c0d73fb70ffa9875843ac62b
TreeHugger Robot [Wed, 28 Jun 2017 00:27:36 +0000 (00:27 +0000)]
Merge "AOD: Pause sensors while proximity is covered" into oc-dr1-dev
TreeHugger Robot [Wed, 28 Jun 2017 00:16:23 +0000 (00:16 +0000)]
Merge "Update fingerprint haptic patterns" into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 22:49:55 +0000 (22:49 +0000)]
Merge "Update nav bar layout for universal grid" into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 22:30:11 +0000 (22:30 +0000)]
Merge "Don't apply locale as part of deferred restore" into oc-dr1-dev
yinxu [Tue, 27 Jun 2017 21:05:17 +0000 (14:05 -0700)]
Use Bundle for inter-process message
The message sent from NetworkScanRequestTracker to TelephonyScanManager
might be across different process, so we have to wrap the List<CellInfo> into
Bundle because List<> is not parcelable.
Test: Telephony sanity tests
Bug:
30954762
Change-Id: I77945b247530b85c0b82876d528549498a711550
Christine Franks [Tue, 27 Jun 2017 21:52:12 +0000 (21:52 +0000)]
Merge "Blacklist Night display settings for testing" into oc-dr1-dev
Michal Karpinski [Tue, 27 Jun 2017 21:47:36 +0000 (21:47 +0000)]
Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev
am:
0d1b1a253a
Change-Id: Idd633c178416ababe623f02327a830939ee769ba
Android Build Merger (Role) [Tue, 27 Jun 2017 21:43:42 +0000 (21:43 +0000)]
Merge "Merge "Use content type specified on the command line" into oc-dev am:
f89bf30312" into oc-dr1-dev
Todd Kennedy [Tue, 27 Jun 2017 21:42:07 +0000 (21:42 +0000)]
Merge "Use content type specified on the command line" into oc-dev
am:
f89bf30312
Change-Id: I2eafecfbf73333541a8b28726dc2af0a456443c0
TreeHugger Robot [Tue, 27 Jun 2017 21:40:53 +0000 (21:40 +0000)]
Merge "Set bolt and plus colors together" into oc-dr1-dev
Jason Monk [Fri, 21 Apr 2017 17:48:19 +0000 (13:48 -0400)]
Update nav bar layout for universal grid
Test: visual
Bug:
37115488
Change-Id: I43fe6648f56d25f41fadefcaa27d2c0cf3f077ba
Jason Monk [Tue, 6 Jun 2017 22:05:57 +0000 (18:05 -0400)]
Add plugin to swap out recents
Adds new mechanism for activities in sysui to be replaced by plugins
and allows that to happen for recents.
Test: runtest systemui
Change-Id: I8b570ce7c57484c58a52afe5e247d24ebfa0c57f
TreeHugger Robot [Tue, 27 Jun 2017 20:33:23 +0000 (20:33 +0000)]
Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev
TreeHugger Robot [Tue, 27 Jun 2017 20:30:45 +0000 (20:30 +0000)]
Merge "Use content type specified on the command line" into oc-dev
Christopher Tate [Tue, 27 Jun 2017 00:35:26 +0000 (17:35 -0700)]
Don't apply locale as part of deferred restore
Once the user has entered normal usage their locale configuration is
essentially guaranteed to be what they intend to use. Don't override
it during deferred restore. (We distinguish based on whether the
device is already marked as 'provisioned'.)
Bug
62224214
Test: manual
Change-Id: Icedef6a86a2b8942937b1384b204def88f2238d2
Shishir Agrawal [Tue, 27 Jun 2017 20:08:04 +0000 (20:08 +0000)]
Merge "Supress roaming indications during a carrier network change." into oc-dev
am:
f1b57080a6
Change-Id: I23d69f5d9b27f893f2b8e8c38f021900d5eb83c2
Winson Chung [Tue, 27 Jun 2017 20:03:55 +0000 (20:03 +0000)]
Merge "Adding additional check for zero-sized snapshot." into oc-dr1-dev
Bill Yi [Tue, 27 Jun 2017 20:01:46 +0000 (20:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
a0376f250f -s ours
Change-Id: I5331ee04e4cd08a2280e07c06f973329a3c41ab4
TreeHugger Robot [Tue, 27 Jun 2017 19:57:57 +0000 (19:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 19:51:15 +0000 (19:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Shishir Agrawal [Tue, 27 Jun 2017 19:50:37 +0000 (19:50 +0000)]
Merge "Supress roaming indications during a carrier network change." into oc-dev
TreeHugger Robot [Tue, 27 Jun 2017 19:49:03 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 19:44:47 +0000 (19:44 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Evan Laird [Tue, 27 Jun 2017 19:32:56 +0000 (15:32 -0400)]
Set bolt and plus colors together
Also test to make sure the colors stay the same.
Test: runtest -x frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/graph/BatteryMeterDrawableBaseTest.java
Bug:
62668861
Change-Id: I7d01fd41aeedcb182dc05da8d7b0501a6b5b8539
TreeHugger Robot [Tue, 27 Jun 2017 18:53:45 +0000 (18:53 +0000)]
Merge "Scrim opacity" into oc-dr1-dev
Jason Monk [Tue, 27 Jun 2017 17:13:49 +0000 (13:13 -0400)]
Add system to avoid a crash stopping tests from running
Add a system such that when a crash happens on the main thread, it is
delayed until the tests complete, then thrown.
Also mark some old flaky tests as not flaky as they should be good
now.
Test: runtest systemui
Change-Id: Ic18a38daf4a93dab63549d834fa00f295644fbf1
Fixes:
62935720,
62251903,
62529569
TreeHugger Robot [Tue, 27 Jun 2017 18:46:24 +0000 (18:46 +0000)]
Merge "Do not duck AAudio streams as a result of focus loss" into oc-dr1-dev
Jason Monk [Tue, 27 Jun 2017 18:46:03 +0000 (14:46 -0400)]
Fix a11y volume not always being shown
When sysui starts up (from crash or boot) wasn't picking up the a11y
mode, so set it manually.
Test: manual
Change-Id: Ia5c6c0b53f1831c702fdc2ad2059eed57ea5b644
Fixes:
63016259
Charlie Wang [Mon, 26 Jun 2017 22:30:03 +0000 (15:30 -0700)]
Adding fields for time elapsed for headset device events.
Headset plug and don/doff events need to have their session times
logged.
Bug:
38431760
Test: Builds
Change-Id: Ia0ea814b8a08169b6e4c566be75e249af8c392a7
TreeHugger Robot [Tue, 27 Jun 2017 17:45:48 +0000 (17:45 +0000)]
Merge "If the menu hasn't been created yet don't do things with it" into oc-dr1-dev
Shishir Agrawal [Mon, 26 Jun 2017 19:06:03 +0000 (12:06 -0700)]
Supress roaming indications during a carrier network change.
Change-Id: Ib39d229b67374c4ca30c3a2c8c3b0050106733cd
Fixes:
62795179
Test: NetworkControllerSignalTest
Julia Reynolds [Fri, 23 Jun 2017 20:13:20 +0000 (16:13 -0400)]
Limit when a ranking reconsidering can alert
Otherwise notifications that were silenced by DND that
still exist when DND is turned off can re-alert.
Test: StatusBarTest, "with zen". No alerts should happen
within ~10 seconds of starting the test
Change-Id: I9e58118c0a40e0d4f1bafb0913e569b560879ba2
Fixes:
62355996
Julius D'souza [Tue, 27 Jun 2017 17:20:53 +0000 (17:20 +0000)]
DO NOT MERGE: Add dynamic doze check for the active doze light sensor. am:
789954fb69 -s ours am:
1cd816eeac -s ours
am:
c994b07e98
Change-Id: I8f95bc993be88d219e5a736ac8bbab51bc7e1c36
Julius D'souza [Tue, 27 Jun 2017 17:14:51 +0000 (17:14 +0000)]
DO NOT MERGE: Add dynamic doze check for the active doze light sensor. am:
789954fb69 -s ours
am:
1cd816eeac -s ours
Change-Id: I1535c1bc21f6c1eaa00787eb2b26a6085f7b69f7
Julius D'souza [Tue, 27 Jun 2017 17:08:48 +0000 (17:08 +0000)]
DO NOT MERGE: Add dynamic doze check for the active doze light sensor.
am:
789954fb69 -s ours
Change-Id: I049ea4d9b8a12740d4a62e2224dbd28dcedc72ba
TreeHugger Robot [Tue, 27 Jun 2017 16:59:33 +0000 (16:59 +0000)]
Merge "Allow VR Virtual display to rotate with content." into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 16:53:52 +0000 (16:53 +0000)]
Merge "Enable getting text_color_primary via Java." into oc-dr1-dev
Adrian Roos [Tue, 27 Jun 2017 16:49:23 +0000 (18:49 +0200)]
AOD: Pause sensors while proximity is covered
Test: manual
Bug:
62484520
Change-Id: I4c5b28e62396fb4178bdec7fa5f1f7af5209e2fa
Jeff Davidson [Fri, 16 Jun 2017 22:20:34 +0000 (15:20 -0700)]
Add EuiccManager#retainSubscriptionsOnFactoryReset API.
By default, all subscriptions are wiped on first boot after a factory
reset. This ensures that if data is wiped outside of userspace (e.g.
in fastboot/recovery), the profiles are wiped, as there's no way to
offer this option to users in those modes - the radio isn't available
for us to access the eUICC.
This API provides a way to bypass this wipe if the user opts to retain
the policies for a wipe done from userspace (e.g. by unchecking the
"Wipe eUICC" checkbox in platform settings before wiping). We tell the
LPA to note this and skip the wipe on the ensuing factory reset.
Change-Id: I2fe472417497e28b043841a5aa2dc9efa45ebbff
Test: TreeHugger
Fixes:
62681577
Christine Franks [Tue, 27 Jun 2017 16:13:35 +0000 (09:13 -0700)]
Blacklist Night display settings for testing
Bug:
38352336
Test: runtest --path
core/tests/coretests/src/android/provider/SettingsBackupTest.java -m
secureSettingsBackedUpOrBlacklisted
Change-Id: I9be8b1c0604482cbc59f90edd154ef7c641b3d56
TreeHugger Robot [Tue, 27 Jun 2017 15:47:50 +0000 (15:47 +0000)]
Merge "Don't assume device has on screen nav bar in RoundedCorners service." into oc-dr1-dev
Michal Karpinski [Tue, 27 Jun 2017 14:08:57 +0000 (15:08 +0100)]
Fix an NPE when cancelling full backup in BMS#endFullBackup()
Bug:
63000171
Test: it's just a nullcheck that compiles
Change-Id: I90faa5577f2fd656bb4f7b6af39494590a77e3bf
Julius D'souza [Tue, 27 Jun 2017 13:48:51 +0000 (06:48 -0700)]
DO NOT MERGE: Add dynamic doze check for the active doze light sensor.
Bug:
62038345
Change-Id: I4b86a1b9ab56f560e863663b9f89195ae1187ab4
Kenny Guy [Tue, 27 Jun 2017 13:04:36 +0000 (13:04 +0000)]
Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev
am:
ba18b0c683
Change-Id: I80adc11fae6eb7ed72c1f304a560e2a5c9f93108
TreeHugger Robot [Tue, 27 Jun 2017 12:55:39 +0000 (12:55 +0000)]
Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev
Adrian Roos [Tue, 27 Jun 2017 12:48:50 +0000 (14:48 +0200)]
AOD: Proximity check doze triggers
Adds a proximity check to doze triggers that fire
while AOD is enabled.
Bug:
62484520
Test: manual
Change-Id: I5c0e8ccec1e470be6722dade06b2e8f174943512
Bill Yi [Tue, 27 Jun 2017 12:46:48 +0000 (05:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie9db11e5a9cc8bdd0108e749ac785eb5a3664a6f
Auto-generated-cl: translation import
TreeHugger Robot [Tue, 27 Jun 2017 12:28:47 +0000 (12:28 +0000)]
Merge "Do not call into ActivityManager when holding mSpManager lock" into oc-dr1-dev
Julius D'souza [Tue, 27 Jun 2017 11:30:00 +0000 (11:30 +0000)]
Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev am:
fef074ad29 -s ours am:
8af046a55e -s ours
am:
af8e230787
Change-Id: I26adc1561e90d9eeca58bb130c2c137e6fea9f40
Julius D'souza [Tue, 27 Jun 2017 11:25:01 +0000 (11:25 +0000)]
Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev am:
fef074ad29 -s ours
am:
8af046a55e -s ours
Change-Id: I6535c07aaf3a62db028da439ead2172c756ef63f
Julius D'souza [Tue, 27 Jun 2017 11:19:01 +0000 (11:19 +0000)]
Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev
am:
fef074ad29 -s ours
Change-Id: I9e6702dc1e7f9dd875f39cfa61bccdb9dfe117a1
Bill Yi [Tue, 27 Jun 2017 11:11:21 +0000 (04:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I65e9dd68965e710fc1e4d62d939fb6dc438b2e87
Auto-generated-cl: translation import
Julius D'souza [Tue, 27 Jun 2017 11:06:40 +0000 (11:06 +0000)]
Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev
Bill Yi [Tue, 27 Jun 2017 10:54:47 +0000 (03:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I322575b88a771dba57f69e28e3d965e502a7e980
Auto-generated-cl: translation import