OSDN Git Service
Adrian Roos [Thu, 15 Dec 2016 22:37:00 +0000 (22:37 +0000)]
DirectReply: Show bouncer when occluded
am:
f37fce5182
Change-Id: Ib3f82893fe744a3d382841e17e5a8e8dc1c3c19b
Michael Kwan [Thu, 15 Dec 2016 21:31:48 +0000 (21:31 +0000)]
Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev am:
738fb65657
am:
106821edfe
Change-Id: I22a94a690862e5456d17e0e2ccd9f62ac9851240
Michael Kwan [Thu, 15 Dec 2016 21:30:42 +0000 (21:30 +0000)]
Fix swipe-to-dismiss to properly react to swipe gestures. am:
8a9b27773b
am:
3707030cf5
Change-Id: Ia856a0b54eebc6821fff47cd90f05d73f49fdefd
Michael Kwan [Thu, 15 Dec 2016 21:24:55 +0000 (21:24 +0000)]
Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev am:
738fb65657
am:
a14aa31ef5
Change-Id: I4ae6d6728c607c985943bce7e4f241c006878f8b
Michael Kwan [Thu, 15 Dec 2016 21:23:44 +0000 (21:23 +0000)]
Fix swipe-to-dismiss to properly react to swipe gestures. am:
8a9b27773b
am:
4308eaa477
Change-Id: Id5fa0c8bd66ca7970c971884c1067aca4ac24124
Michael Kwan [Thu, 15 Dec 2016 21:16:19 +0000 (21:16 +0000)]
Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev
am:
738fb65657
Change-Id: Ica017f0a0490c522777f20e38b7db16872ccc615
Michael Kwan [Thu, 15 Dec 2016 21:16:15 +0000 (21:16 +0000)]
Fix swipe-to-dismiss to properly react to swipe gestures.
am:
8a9b27773b
Change-Id: If7040c0f1cc71edcc16021b4825fb5d1d6fbdecf
Michael Kwan [Thu, 15 Dec 2016 21:16:08 +0000 (21:16 +0000)]
Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev
am:
738fb65657
Change-Id: Ib2ab0dc43370d8387a56f2e3b3e3d50d44d7b772
Michael Kwan [Thu, 15 Dec 2016 21:16:05 +0000 (21:16 +0000)]
Fix swipe-to-dismiss to properly react to swipe gestures.
am:
8a9b27773b
Change-Id: I2b25052c22b5f50f95d0365eff4e3b2e27625b7f
Michael Kwan [Thu, 15 Dec 2016 21:09:53 +0000 (21:09 +0000)]
Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev
Martijn Coenen [Thu, 15 Dec 2016 20:55:49 +0000 (20:55 +0000)]
Merge "HwBinder: Remove use of IHw class." am:
11ec22ab2a am:
df296fe1fa
am:
370815ef62
Change-Id: I9a6b8dc6cf2e4c9d424c34513129d965155a0df7
dcashman [Thu, 15 Dec 2016 20:54:50 +0000 (20:54 +0000)]
Merge "Split mac_permissions.xml into plat and non-plat components." am:
a1c9c860a9 am:
455202b9db
am:
33d3d19235
Change-Id: I4c60853dc695943d1c9374ab5e1cc8af995de154
dcashman [Thu, 15 Dec 2016 20:48:20 +0000 (20:48 +0000)]
Split mac_permissions.xml into plat and non-plat components. am:
b1cc4f8ca4 am:
2a7ce100b7
am:
46d6966f43
Change-Id: I99def3496b5319c2dd717b02fe28d9c691b47880
Martijn Coenen [Thu, 15 Dec 2016 20:47:05 +0000 (20:47 +0000)]
Merge "HwBinder: Remove use of IHw class." am:
11ec22ab2a
am:
df296fe1fa
Change-Id: I1c1069b5d2c1452f1cc9ee33725c3fa8f541966c
dcashman [Thu, 15 Dec 2016 20:45:55 +0000 (20:45 +0000)]
Merge "Split mac_permissions.xml into plat and non-plat components." am:
a1c9c860a9
am:
455202b9db
Change-Id: I2a314f827db34cc92058729629d9000526b43027
dcashman [Thu, 15 Dec 2016 20:41:14 +0000 (20:41 +0000)]
Split mac_permissions.xml into plat and non-plat components. am:
b1cc4f8ca4
am:
2a7ce100b7
Change-Id: I9d0e0f824fdc26c64d41f97b370f7483b63b97c5
Martijn Coenen [Thu, 15 Dec 2016 20:38:07 +0000 (20:38 +0000)]
Merge "HwBinder: Remove use of IHw class."
am:
11ec22ab2a
Change-Id: Icbeb3bb7548b00c5e28f689c761a4de425e1bd74
dcashman [Thu, 15 Dec 2016 20:32:54 +0000 (20:32 +0000)]
Merge "Split mac_permissions.xml into plat and non-plat components."
am:
a1c9c860a9
Change-Id: I11397c898e5cf7b0dd4a300646b409d28eb00b59
Martijn Coenen [Thu, 15 Dec 2016 20:28:48 +0000 (20:28 +0000)]
Merge "HwBinder: Remove use of IHw class."
dcashman [Thu, 15 Dec 2016 20:27:27 +0000 (20:27 +0000)]
Split mac_permissions.xml into plat and non-plat components.
am:
b1cc4f8ca4
Change-Id: I4c3d3a9c088c4cfc75f5503966390030e1375305
Treehugger Robot [Thu, 15 Dec 2016 20:13:28 +0000 (20:13 +0000)]
Merge "Split mac_permissions.xml into plat and non-plat components."
Android Build Merger (Role) [Thu, 15 Dec 2016 19:12:49 +0000 (19:12 +0000)]
Merge "Add null check to a11y interrupt. am:
74f9e1b867 am:
278782f275" into nyc-mr2-dev-plus-aosp
Phil Weaver [Thu, 15 Dec 2016 19:12:02 +0000 (19:12 +0000)]
Add null check to a11y interrupt. am:
74f9e1b867
am:
718f403b50
Change-Id: I9d70640813bd91e035f9614f0403e18b7706e53f
Phil Weaver [Thu, 15 Dec 2016 19:11:56 +0000 (19:11 +0000)]
Add null check to a11y interrupt. am:
74f9e1b867
am:
278782f275
Change-Id: I92d0cce490535b667a10de46fe0e24fad6305c13
Phil Weaver [Thu, 15 Dec 2016 19:05:00 +0000 (19:05 +0000)]
Add null check to a11y interrupt.
am:
74f9e1b867
Change-Id: I51bcf42327f30a0c6b1dc7666a5c057d44eec98c
Phil Weaver [Thu, 15 Dec 2016 19:04:59 +0000 (19:04 +0000)]
Add null check to a11y interrupt.
am:
74f9e1b867
Change-Id: I8bb63b88a12ab6f8dfae42918ab9fdf4b1a457b5
dcashman [Wed, 14 Dec 2016 21:46:05 +0000 (13:46 -0800)]
Split mac_permissions.xml into plat and non-plat components.
Bug:
31363362
Test: Bullhead and Sailfish both build and boot without new denials.
Change-Id: Ic9523ce4b0755d6c585548f4f2b1f00e7000195b
Michal Karpinski [Thu, 15 Dec 2016 14:31:47 +0000 (14:31 +0000)]
DO NOT MERGE Make NetworkLogger.mIsLoggingEnabled an AtomicBoolean
am:
92cd0ce92d
Change-Id: I598cd5962f9e38750d528f480b7a99e3357fc437
Michal Karpinski [Thu, 15 Dec 2016 10:30:18 +0000 (10:30 +0000)]
DO NOT MERGE Make NetworkLogger.mIsLoggingEnabled an AtomicBoolean
Fixes a potential race condition - when enabling/disabling the logging
some events might have been lost.
Bug:
29748723
Change-Id: I8a436d525393b2314805e287eddcea26d4ec073b
Erik Kline [Thu, 15 Dec 2016 12:35:13 +0000 (12:35 +0000)]
Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." am:
80ff5ecd4a am:
cdcc931d93
am:
62c1d307e3
Change-Id: I05da79d601d412270a71026bbbad3c516a785422
Erik Kline [Thu, 15 Dec 2016 12:28:41 +0000 (12:28 +0000)]
Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." am:
80ff5ecd4a
am:
cdcc931d93
Change-Id: Ib46bdab897cef221f4c22326e562130822d42298
Erik Kline [Thu, 15 Dec 2016 12:22:06 +0000 (12:22 +0000)]
Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity."
am:
80ff5ecd4a
Change-Id: If85702e1cc44967841ab91d723aa627862bcda21
Erik Kline [Thu, 15 Dec 2016 12:10:16 +0000 (12:10 +0000)]
Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity."
Joachim Sauer [Thu, 15 Dec 2016 11:54:42 +0000 (11:54 +0000)]
Merge "API updated for ICU4J 58.1" am:
9e3b160fc3 am:
d20aebb443
am:
c066d73c32
Change-Id: Ie3f10df12dd96d9e002bdef017759c394aa3e780
Joachim Sauer [Thu, 15 Dec 2016 11:39:37 +0000 (11:39 +0000)]
Merge "API updated for ICU4J 58.1" am:
9e3b160fc3
am:
d20aebb443
Change-Id: Ib3ddf7441306adca048e2ef5c6cda31bb2543df6
Joachim Sauer [Thu, 15 Dec 2016 11:24:52 +0000 (11:24 +0000)]
Merge "API updated for ICU4J 58.1"
am:
9e3b160fc3
Change-Id: If8d8b9708217442bf23f092ef2e1bfd235926aff
Joachim Sauer [Thu, 15 Dec 2016 11:16:39 +0000 (11:16 +0000)]
Merge "API updated for ICU4J 58.1"
Erik Kline [Thu, 15 Dec 2016 10:13:48 +0000 (10:13 +0000)]
Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." into nyc-mr2-dev
am:
c75ab85cd2
Change-Id: Ie343e7b86b970f2d934b964eebe924f74b0138d2
Erik Kline [Thu, 15 Dec 2016 10:13:36 +0000 (10:13 +0000)]
Have IpManager track L2-L4 signaling traffic required for IP connectivity.
am:
473355f96b
Change-Id: Ie95309464d8f368f5040c74b59daba9700191e86
Erik Kline [Wed, 19 Oct 2016 08:42:01 +0000 (17:42 +0900)]
Have IpManager track L2-L4 signaling traffic required for IP connectivity.
Test: as follows
- built and flashed
- observed logcat
- observed "dumpsys wifi ipmanager"
- runtest BlockingSocketReaderTest passes
- runtest ConnectivityPacketSummaryTest passes
Bug:
21859053
Bug:
26101306
Bug:
31742572
Bug:
31707128
Bug:
33531488
Change-Id: Ibecaf809dcc1813924b25749e8ba8eb2d4bdf114
TreeHugger Robot [Thu, 15 Dec 2016 10:03:44 +0000 (10:03 +0000)]
Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." into nyc-mr2-dev
Erik Kline [Wed, 19 Oct 2016 08:42:01 +0000 (17:42 +0900)]
Have IpManager track L2-L4 signaling traffic required for IP connectivity.
Test: as follows
- built and flashed
- observed logcat
- observed "dumpsys wifi ipmanager"
- runtest BlockingSocketReaderTest passes
- runtest ConnectivityPacketSummaryTest passes
Bug:
21859053
Bug:
26101306
Bug:
31742572
Bug:
31707128
Bug:
33531488
Change-Id: Ibecaf809dcc1813924b25749e8ba8eb2d4bdf114
Phil Weaver [Wed, 2 Nov 2016 22:40:42 +0000 (15:40 -0700)]
Add null check to a11y interrupt.
Also adding same robustness to interrupt that we have for
sending a11y events.
Bug:
32507871
Test: Ran a11y CTS. Verified manually with sample app
that sends interrupt and accessibility service that
crashes when started. That case used to crash the
app, and doesn't anymore.
Change-Id: I5cf05dcbb54ea23ae876cb3258dd206c55dce775
(cherry picked from commit
867ad35d9c676b5ba2047b0fc9a4006737e5c4aa)
Bill Yi [Thu, 15 Dec 2016 08:03:52 +0000 (08:03 +0000)]
Import translations. DO NOT MERGE
am:
1e0cc808ab -s ours
Change-Id: I1d7db8246f0864af9e03f6dee3cf6206763b3301
Colin Cross [Thu, 15 Dec 2016 07:31:25 +0000 (07:31 +0000)]
Merge changes I4968d5aa,Ieb34d79a,Idc073536 am:
c2f9ae35e6 am:
4379639606
am:
b9743aa650
Change-Id: Ib90a26ffe1b9af8cf83c8b1c1342aaa9f5e06752
Colin Cross [Thu, 15 Dec 2016 07:30:25 +0000 (07:30 +0000)]
Move hwui private headers to frameworks/base/libs/hwui/private am:
19def9943a am:
174d150673
am:
6b629b7f38
Change-Id: Ic62fcf3d48ad58c1dec0fc6ddf3eaacc8140cc18
Colin Cross [Thu, 15 Dec 2016 07:29:24 +0000 (07:29 +0000)]
Convert libstorage to Android.bp am:
3ac2be93a9 am:
f12ae4bed7
am:
791d02818a
Change-Id: I73bb8a7332a6ba9aebf413cf9f0889ff9d98a5de
Colin Cross [Thu, 15 Dec 2016 07:28:24 +0000 (07:28 +0000)]
Move libstorage includes into frameworks/base/lib/storage am:
e78f853e46 am:
afef87b1ba
am:
f142640afb
Change-Id: I9f084034f960478ee6141158a0a0c5119d1879a4
Colin Cross [Thu, 15 Dec 2016 07:18:02 +0000 (07:18 +0000)]
Merge changes I4968d5aa,Ieb34d79a,Idc073536 am:
c2f9ae35e6
am:
4379639606
Change-Id: I1d29954997012b2ac435dab96486175a40cd65a8
Colin Cross [Thu, 15 Dec 2016 07:16:31 +0000 (07:16 +0000)]
Move hwui private headers to frameworks/base/libs/hwui/private am:
19def9943a
am:
174d150673
Change-Id: I0d97c3bc96c0beebc5988e4dca22ba4d5d1f982c
Colin Cross [Thu, 15 Dec 2016 07:15:32 +0000 (07:15 +0000)]
Convert libstorage to Android.bp am:
3ac2be93a9
am:
f12ae4bed7
Change-Id: I1255ee2b166b73a79b19035d59994204bb268c82
Colin Cross [Thu, 15 Dec 2016 07:14:32 +0000 (07:14 +0000)]
Move libstorage includes into frameworks/base/lib/storage am:
e78f853e46
am:
afef87b1ba
Change-Id: Iff9c41710528af37a788973ac4a1080024808c95
Colin Cross [Thu, 15 Dec 2016 07:01:01 +0000 (07:01 +0000)]
Merge changes I4968d5aa,Ieb34d79a,Idc073536
am:
c2f9ae35e6
Change-Id: Icd7cc5949d1388a5f928561dc0eea8a7df91b1b9
Colin Cross [Thu, 15 Dec 2016 07:00:54 +0000 (07:00 +0000)]
Move hwui private headers to frameworks/base/libs/hwui/private
am:
19def9943a
Change-Id: Ic26ef842f58a9db61e7ee12b3d4d858fc24cfbc8
Colin Cross [Thu, 15 Dec 2016 07:00:07 +0000 (07:00 +0000)]
Convert libstorage to Android.bp
am:
3ac2be93a9
Change-Id: Ia1d78149bfedcc7e8959d557ac3a239a77c04924
Colin Cross [Thu, 15 Dec 2016 06:59:18 +0000 (06:59 +0000)]
Move libstorage includes into frameworks/base/lib/storage
am:
e78f853e46
Change-Id: Icac09a62152f11cf7a8d5ce5ffe9011949e17ec0
Treehugger Robot [Thu, 15 Dec 2016 06:49:35 +0000 (06:49 +0000)]
Merge changes I4968d5aa,Ieb34d79a,Idc073536
* changes:
Move hwui private headers to frameworks/base/libs/hwui/private
Convert libstorage to Android.bp
Move libstorage includes into frameworks/base/lib/storage
Erik Kline [Thu, 15 Dec 2016 05:40:17 +0000 (05:40 +0000)]
Merge "More correct startup and shutdown procedures." am:
618d4215a2 am:
b6588f9a41
am:
7074b562d9
Change-Id: I8c1e0b235808635a910262a65530e655408cc5d8
Erik Kline [Thu, 15 Dec 2016 05:32:50 +0000 (05:32 +0000)]
Merge "More correct startup and shutdown procedures." am:
618d4215a2
am:
b6588f9a41
Change-Id: I8a2bcab3b9373d2573601fa3bffa123020b3fbae
Erik Kline [Thu, 15 Dec 2016 05:25:48 +0000 (05:25 +0000)]
Merge "More correct startup and shutdown procedures."
am:
618d4215a2
Change-Id: I4844130b04ded0fc913593081d07a6052bdc0e42
Treehugger Robot [Thu, 15 Dec 2016 05:10:10 +0000 (05:10 +0000)]
Merge "More correct startup and shutdown procedures."
Bill Yi [Thu, 15 Dec 2016 02:56:18 +0000 (18:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5a8c801eacef878f41a988ed655e6fa367909033
Auto-generated-cl: translation import
Erik Kline [Mon, 12 Dec 2016 12:21:40 +0000 (21:21 +0900)]
More correct startup and shutdown procedures.
During IpManager startup, anything sending messages to the state machine
must not begin doing so until after the state machine has been started.
Reorder the constructor accordingly.
During shutdown, AvoidBadWifiTracker needs to unregister the registered
BroadcastReceiver and might as well also unregister the ContentObserver.
Test: backport from internal
Bug:
33388922
Change-Id: I58e07f7ccddaab160c153bcfb69fd45f50bb8710
George Burgess IV [Wed, 14 Dec 2016 23:49:07 +0000 (23:49 +0000)]
Merge "Fix a memory leak." am:
1715678a89 am:
8f9c005fa9
am:
85785b557a
Change-Id: I1e05b7d2793797cba915d0debd775b6b09b972cb
George Burgess IV [Wed, 14 Dec 2016 23:41:26 +0000 (23:41 +0000)]
Merge "Fix a memory leak." am:
1715678a89
am:
8f9c005fa9
Change-Id: I29afa8d1394feb57574ed527cda102405571fd65
George Burgess IV [Wed, 14 Dec 2016 23:34:23 +0000 (23:34 +0000)]
Merge "Fix a memory leak."
am:
1715678a89
Change-Id: Ia005c534ef0e62e3efd6f59954cd2850349c7672
Hall Liu [Wed, 14 Dec 2016 23:30:01 +0000 (23:30 +0000)]
Merge "Add ability to set supported audio routes on phone accounts and connection" am:
d11261dcc9 am:
32e98d2f45
am:
60cb82e8e6
Change-Id: I9bfe58895aadcd5c40bae1bfc7a093feee4a6aa2
Jeremy Joslin [Wed, 14 Dec 2016 23:28:56 +0000 (23:28 +0000)]
Merge "Add an IPC for requesting network scores." am:
e89ed4a001 am:
724b26c902
am:
a00fda5311
Change-Id: I5b529ba1f9a151e108229c493cbdc0facd494d30
Marie Janssen [Wed, 14 Dec 2016 23:27:54 +0000 (23:27 +0000)]
resolve merge conflicts of
7a2518e to nyc-mr1-dev-plus-aosp
am:
f2fc15824d
Change-Id: I71d80c8a24f206d5919f56a28b1f1333021b7d46
Treehugger Robot [Wed, 14 Dec 2016 23:23:50 +0000 (23:23 +0000)]
Merge "Fix a memory leak."
Hall Liu [Wed, 14 Dec 2016 23:23:21 +0000 (23:23 +0000)]
Merge "Add ability to set supported audio routes on phone accounts and connection" am:
d11261dcc9
am:
32e98d2f45
Change-Id: I0741edc2b35b7c57cbde338c4617791d1d089137
Jeremy Joslin [Wed, 14 Dec 2016 23:22:15 +0000 (23:22 +0000)]
Merge "Add an IPC for requesting network scores." am:
e89ed4a001
am:
724b26c902
Change-Id: If6284c934cd47257367c614523d4928758ab34e1
Marie Janssen [Wed, 14 Dec 2016 21:44:28 +0000 (13:44 -0800)]
resolve merge conflicts of
7a2518e to nyc-mr1-dev-plus-aosp
Change-Id: I903680717ed121a93fee3b7c2ed358cb29726d71
Colin Cross [Wed, 14 Dec 2016 21:34:20 +0000 (13:34 -0800)]
Move hwui private headers to frameworks/base/libs/hwui/private
hwui already exports most of its headers, move its private headers
into its source directory.
Bug:
33630870
Test: m -j native
Change-Id: I4968d5aaaa68d9e92c826841d20f29cef349c9d8
Colin Cross [Wed, 14 Dec 2016 21:06:07 +0000 (13:06 -0800)]
Convert libstorage to Android.bp
See build/soong/README.md for more information.
Test: m -j native
Change-Id: Ieb34d79af10e4e7cd146d0d40fd6946499dd1da0
Colin Cross [Wed, 14 Dec 2016 21:03:12 +0000 (13:03 -0800)]
Move libstorage includes into frameworks/base/lib/storage
Move the libstorage includes out of the global include path and into
frameworks/base/lib/storage/include, and export it.
Bug:
33630870
Test: m -j native
Change-Id: Idc0735360abc703496b9bc46d1a76ce8039af0d1
Hall Liu [Wed, 14 Dec 2016 20:03:54 +0000 (20:03 +0000)]
Merge "Add ability to set supported audio routes on phone accounts and connection"
am:
d11261dcc9
Change-Id: I002d1d32e6c0fb69c99047a19ca07f4326ec5323
Jeremy Joslin [Wed, 14 Dec 2016 20:02:45 +0000 (20:02 +0000)]
Merge "Add an IPC for requesting network scores."
am:
e89ed4a001
Change-Id: I23bee3f29d3b3f71da6103e23afafc2df128ab75
Marie Janssen [Wed, 14 Dec 2016 20:01:39 +0000 (20:01 +0000)]
Merge "Bluetooth: log message improvements"
am:
f34bdf7676
Change-Id: Ic89c59257559d95119829fa4157dbb763124e86f
Hall Liu [Wed, 14 Dec 2016 19:55:00 +0000 (19:55 +0000)]
Merge "Add ability to set supported audio routes on phone accounts and connection"
Treehugger Robot [Wed, 14 Dec 2016 19:47:48 +0000 (19:47 +0000)]
Merge "Add an IPC for requesting network scores."
Treehugger Robot [Wed, 14 Dec 2016 19:47:31 +0000 (19:47 +0000)]
Merge "Bluetooth: log message improvements"
Android Build Merger (Role) [Wed, 14 Dec 2016 19:30:48 +0000 (19:30 +0000)]
Merge "fix case issues with mGoingIdleWakeLock in DeviceIdleController am:
e6f8cb29ec -s ours am:
7a69e8f3d8 am:
af0b547fc7 am:
20081c4e71 am:
8cc9f081aa am:
1838237435 am:
7af83d0e5a" into nyc-mr2-dev-plus-aosp
Julius D'souza [Wed, 14 Dec 2016 19:30:03 +0000 (19:30 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController am:
e6f8cb29ec -s ours am:
7a69e8f3d8 am:
af0b547fc7 am:
20081c4e71 am:
8cc9f081aa am:
1838237435
am:
7af83d0e5a
Change-Id: I0a52e7f2e1e71bbef0db99ca8373fe58dae4ac49
Julius D'souza [Wed, 14 Dec 2016 19:30:00 +0000 (19:30 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController am:
e6f8cb29ec -s ours am:
7a69e8f3d8 am:
af0b547fc7 am:
20081c4e71 am:
8cc9f081aa am:
1838237435
am:
6b953b0f0b
Change-Id: Ida7cbc107a548a0f5451099f1a6b6d815d61927a
Julius D'souza [Wed, 14 Dec 2016 19:24:10 +0000 (19:24 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController am:
e6f8cb29ec -s ours am:
7a69e8f3d8 am:
af0b547fc7 am:
20081c4e71 am:
8cc9f081aa
am:
1838237435
Change-Id: Ib189c8e059a6d867e9ece1d03c193dc5f8002fad
Julius D'souza [Wed, 14 Dec 2016 19:24:01 +0000 (19:24 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController am:
e6f8cb29ec -s ours am:
7a69e8f3d8 am:
af0b547fc7 am:
20081c4e71 am:
8cc9f081aa
am:
1838237435
Change-Id: I1db5fee4adb196ff725815c3e4182f7e661e6d26
Julius D'souza [Wed, 14 Dec 2016 19:18:04 +0000 (19:18 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController am:
e6f8cb29ec -s ours am:
7a69e8f3d8 am:
af0b547fc7 am:
20081c4e71
am:
8cc9f081aa
Change-Id: I39ecaf420d8bc4390c737fd378fd0e32202e2d8c
Julius D'souza [Wed, 14 Dec 2016 19:11:59 +0000 (19:11 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController am:
e6f8cb29ec -s ours am:
7a69e8f3d8 am:
af0b547fc7
am:
20081c4e71
Change-Id: I5e461a835cf64ba69894da2c5493a9d8a1ebcbcf
Julius D'souza [Wed, 14 Dec 2016 19:06:29 +0000 (19:06 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController am:
e6f8cb29ec -s ours am:
7a69e8f3d8
am:
af0b547fc7
Change-Id: I23ef765ebbd2dde2110946fcc46c6b61e11733f2
Julius D'souza [Wed, 14 Dec 2016 19:00:38 +0000 (19:00 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController am:
e6f8cb29ec -s ours
am:
7a69e8f3d8
Change-Id: I581e1cd6ef0dec7042802b29dd76db8ffc02cec3
Julius D'souza [Wed, 14 Dec 2016 18:54:02 +0000 (18:54 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController
am:
e6f8cb29ec -s ours
Change-Id: Ia7bdba0fd3d52bb2d7c33f81d376336563f3a5cb
Julius D'souza [Wed, 14 Dec 2016 18:30:25 +0000 (10:30 -0800)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController
Bug:
31900521
Change-Id: I9484b10f0e6b99dfaf11266bb275a31d7ff3868c
Android Build Merger (Role) [Wed, 14 Dec 2016 18:24:41 +0000 (18:24 +0000)]
Merge "DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am:
f9f39cc4a8 -s ours am:
589f83e686 -s ours am:
495aa09cc6 -s ours am:
10a9005003 -s ours am:
03c946e06b -s ours am:
c2aed112a7 -s ours am:
a481fd31cf -s ours" into nyc-mr2-dev-plus-aosp
Julius D'souza [Wed, 14 Dec 2016 18:23:54 +0000 (18:23 +0000)]
DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am:
f9f39cc4a8 -s ours am:
589f83e686 -s ours am:
495aa09cc6 -s ours am:
10a9005003 -s ours am:
03c946e06b -s ours am:
c2aed112a7 -s ours
am:
a481fd31cf -s ours
Change-Id: Ie297e4f891fbafb765d8ba12777012deeac49020
Android Build Merger (Role) [Wed, 14 Dec 2016 18:23:32 +0000 (18:23 +0000)]
Merge "Merge changes from topic 'backportSharedpreferencesSpeedUp' into nyc-mr2-dev am:
61b0f84005" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Wed, 14 Dec 2016 18:23:10 +0000 (18:23 +0000)]
Merge "Do not write if apply() did not change the file. am:
ea10cc0fbb" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Wed, 14 Dec 2016 18:22:45 +0000 (18:22 +0000)]
Merge "Only persist last Shared Preferences state am:
31d6889f4c" into nyc-mr2-dev-plus-aosp
Philip P. Moltmann [Wed, 14 Dec 2016 18:21:47 +0000 (18:21 +0000)]
Merge changes from topic 'backportSharedpreferencesSpeedUp' into nyc-mr2-dev
am:
61b0f84005
Change-Id: I0d2d0cffe3a78a843ae97d3946bbbbd7d4138044
Philip P. Moltmann [Wed, 14 Dec 2016 18:21:39 +0000 (18:21 +0000)]
Do not write if apply() did not change the file.
am:
ea10cc0fbb
Change-Id: I58f1f71dd4a8b4725205555531fa5d66284e3cd0