Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
279,985 Commits 3 Branches 0 Tags
fe9ffc29ffe2ba321802871edf26b34cb903f1a7
Commit Graph

279985 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Cross
fe9ffc29ff Convert libstorage to Android.bp am: 3ac2be93a9 am: f12ae4bed7 
am: 791d02818a

Change-Id: I73bb8a7332a6ba9aebf413cf9f0889ff9d98a5de
 2016-12-15 07:29:24 +00:00
Colin Cross
e6120caf2a Move libstorage includes into frameworks/base/lib/storage am: e78f853e46 am: afef87b1ba 
am: f142640afb

Change-Id: I9f084034f960478ee6141158a0a0c5119d1879a4
 2016-12-15 07:28:24 +00:00
Colin Cross
791d02818a Convert libstorage to Android.bp am: 3ac2be93a9 
am: f12ae4bed7

Change-Id: I1255ee2b166b73a79b19035d59994204bb268c82
 2016-12-15 07:15:32 +00:00
Colin Cross
f142640afb Move libstorage includes into frameworks/base/lib/storage am: e78f853e46 
am: afef87b1ba

Change-Id: Iff9c41710528af37a788973ac4a1080024808c95
 2016-12-15 07:14:32 +00:00
Colin Cross
f12ae4bed7 Convert libstorage to Android.bp 
am: 3ac2be93a9

Change-Id: Ia1d78149bfedcc7e8959d557ac3a239a77c04924
 2016-12-15 07:00:07 +00:00
Colin Cross
afef87b1ba Move libstorage includes into frameworks/base/lib/storage 
am: e78f853e46

Change-Id: Icac09a62152f11cf7a8d5ce5ffe9011949e17ec0
 2016-12-15 06:59:18 +00:00
Erik Kline
579c86f622 Merge "More correct startup and shutdown procedures." am: 618d4215a2 am: b6588f9a41 
am: 7074b562d9

Change-Id: I8c1e0b235808635a910262a65530e655408cc5d8
 2016-12-15 05:40:17 +00:00
Erik Kline
7074b562d9 Merge "More correct startup and shutdown procedures." am: 618d4215a2 
am: b6588f9a41

Change-Id: I8a2bcab3b9373d2573601fa3bffa123020b3fbae
 2016-12-15 05:32:50 +00:00
Erik Kline
b6588f9a41 Merge "More correct startup and shutdown procedures." 
am: 618d4215a2

Change-Id: I4844130b04ded0fc913593081d07a6052bdc0e42
 2016-12-15 05:25:48 +00:00
Treehugger Robot
618d4215a2 Merge "More correct startup and shutdown procedures." 2016-12-15 05:10:11 +00:00
Erik Kline
c8585b9742 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
 2016-12-15 10:43:41 +09:00
George Burgess IV
9dfed40bd8 Merge "Fix a memory leak." am: 1715678a89 am: 8f9c005fa9 
am: 85785b557a

Change-Id: I1e05b7d2793797cba915d0debd775b6b09b972cb
 2016-12-14 23:49:07 +00:00
George Burgess IV
85785b557a Merge "Fix a memory leak." am: 1715678a89 
am: 8f9c005fa9

Change-Id: I29afa8d1394feb57574ed527cda102405571fd65
 2016-12-14 23:41:26 +00:00
George Burgess IV
8f9c005fa9 Merge "Fix a memory leak." 
am: 1715678a89

Change-Id: Ia005c534ef0e62e3efd6f59954cd2850349c7672
 2016-12-14 23:34:23 +00:00
Hall Liu
9e0f5d1abf Merge "Add ability to set supported audio routes on phone accounts and connection" am: d11261dcc9 am: 32e98d2f45 
am: 60cb82e8e6

Change-Id: I9bfe58895aadcd5c40bae1bfc7a093feee4a6aa2
 2016-12-14 23:30:01 +00:00
Jeremy Joslin
9f15b30858 Merge "Add an IPC for requesting network scores." am: e89ed4a001 am: 724b26c902 
am: a00fda5311

Change-Id: I5b529ba1f9a151e108229c493cbdc0facd494d30
 2016-12-14 23:28:56 +00:00
Marie Janssen
2f94877c01 resolve merge conflicts of 7a2518e to nyc-mr1-dev-plus-aosp 
am: f2fc15824d

Change-Id: I71d80c8a24f206d5919f56a28b1f1333021b7d46
 2016-12-14 23:27:54 +00:00
Treehugger Robot
1715678a89 Merge "Fix a memory leak." 2016-12-14 23:23:52 +00:00
Hall Liu
60cb82e8e6 Merge "Add ability to set supported audio routes on phone accounts and connection" am: d11261dcc9 
am: 32e98d2f45

Change-Id: I0741edc2b35b7c57cbde338c4617791d1d089137
 2016-12-14 23:23:21 +00:00
Jeremy Joslin
a00fda5311 Merge "Add an IPC for requesting network scores." am: e89ed4a001 
am: 724b26c902

Change-Id: If6284c934cd47257367c614523d4928758ab34e1
 2016-12-14 23:22:15 +00:00
Marie Janssen
f2fc15824d resolve merge conflicts of 7a2518e to nyc-mr1-dev-plus-aosp 
Change-Id: I903680717ed121a93fee3b7c2ed358cb29726d71
 2016-12-14 13:44:28 -08:00
Colin Cross
3ac2be93a9 Convert libstorage to Android.bp 
See build/soong/README.md for more information.

Test: m -j native
Change-Id: Ieb34d79af10e4e7cd146d0d40fd6946499dd1da0
 2016-12-14 13:28:56 -08:00
Colin Cross
e78f853e46 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
 2016-12-14 13:28:46 -08:00
Hall Liu
32e98d2f45 Merge "Add ability to set supported audio routes on phone accounts and connection" 
am: d11261dcc9

Change-Id: I002d1d32e6c0fb69c99047a19ca07f4326ec5323
 2016-12-14 20:03:54 +00:00
Jeremy Joslin
724b26c902 Merge "Add an IPC for requesting network scores." 
am: e89ed4a001

Change-Id: I23bee3f29d3b3f71da6103e23afafc2df128ab75
 2016-12-14 20:02:45 +00:00
Marie Janssen
7a2518ee6e Merge "Bluetooth: log message improvements" 
am: f34bdf7676

Change-Id: Ic89c59257559d95119829fa4157dbb763124e86f
 2016-12-14 20:01:39 +00:00
Hall Liu
d11261dcc9 Merge "Add ability to set supported audio routes on phone accounts and connection" 2016-12-14 19:55:00 +00:00
Treehugger Robot
e89ed4a001 Merge "Add an IPC for requesting network scores." 2016-12-14 19:47:48 +00:00
Treehugger Robot
f34bdf7676 Merge "Bluetooth: log message improvements" 2016-12-14 19:47:32 +00:00
Android Build Merger (Role)
04acb73b85 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 2016-12-14 19:30:52 +00:00
Julius D'souza
d02ff5c066 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
 2016-12-14 19:30:03 +00:00
Julius D'souza
f8c511e533 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
 2016-12-14 19:30:00 +00:00
Julius D'souza
6b953b0f0b fix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec -s ours am: 7a69e8f3d8 am: af0b547fc7 am: 20081c4e71 am: 8cc9f081aa 
am: 1838237435

Change-Id: Ib189c8e059a6d867e9ece1d03c193dc5f8002fad
 2016-12-14 19:24:10 +00:00
Julius D'souza
7af83d0e5a fix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec -s ours am: 7a69e8f3d8 am: af0b547fc7 am: 20081c4e71 am: 8cc9f081aa 
am: 1838237435

Change-Id: I1db5fee4adb196ff725815c3e4182f7e661e6d26
 2016-12-14 19:24:01 +00:00
Julius D'souza
1838237435 fix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec -s ours am: 7a69e8f3d8 am: af0b547fc7 am: 20081c4e71 
am: 8cc9f081aa

Change-Id: I39ecaf420d8bc4390c737fd378fd0e32202e2d8c
 2016-12-14 19:18:04 +00:00
Julius D'souza
8cc9f081aa fix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec -s ours am: 7a69e8f3d8 am: af0b547fc7 
am: 20081c4e71

Change-Id: I5e461a835cf64ba69894da2c5493a9d8a1ebcbcf
 2016-12-14 19:11:59 +00:00
Julius D'souza
20081c4e71 fix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec -s ours am: 7a69e8f3d8 
am: af0b547fc7

Change-Id: I23ef765ebbd2dde2110946fcc46c6b61e11733f2
 2016-12-14 19:06:29 +00:00
Julius D'souza
af0b547fc7 fix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec -s ours 
am: 7a69e8f3d8

Change-Id: I581e1cd6ef0dec7042802b29dd76db8ffc02cec3
 2016-12-14 19:00:38 +00:00
Julius D'souza
7a69e8f3d8 fix case issues with mGoingIdleWakeLock in DeviceIdleController 
am: e6f8cb29ec  -s ours

Change-Id: Ia7bdba0fd3d52bb2d7c33f81d376336563f3a5cb
 2016-12-14 18:54:02 +00:00
Julius D'souza
e6f8cb29ec fix case issues with mGoingIdleWakeLock in DeviceIdleController 
Bug: 31900521

Change-Id: I9484b10f0e6b99dfaf11266bb275a31d7ff3868c
 2016-12-14 10:31:12 -08:00
Android Build Merger (Role)
3039f42e67 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 2016-12-14 18:24:45 +00:00
Julius D'souza
eb9e0555f4 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
 2016-12-14 18:23:54 +00:00
Android Build Merger (Role)
13b2cfdfdf Merge "Merge changes from topic 'backportSharedpreferencesSpeedUp' into nyc-mr2-dev am: 61b0f84005" into nyc-mr2-dev-plus-aosp 2016-12-14 18:23:36 +00:00
Android Build Merger (Role)
c20a6d99c5 Merge "Do not write if apply() did not change the file. am: ea10cc0fbb" into nyc-mr2-dev-plus-aosp 2016-12-14 18:23:14 +00:00
Android Build Merger (Role)
b152876f2d Merge "Only persist last Shared Preferences state am: 31d6889f4c" into nyc-mr2-dev-plus-aosp 2016-12-14 18:22:48 +00:00
Philip P. Moltmann
fddf68261e Merge changes from topic 'backportSharedpreferencesSpeedUp' into nyc-mr2-dev 
am: 61b0f84005

Change-Id: I0d2d0cffe3a78a843ae97d3946bbbbd7d4138044
 2016-12-14 18:21:47 +00:00
Philip P. Moltmann
fbf2adaf6e Do not write if apply() did not change the file. 
am: ea10cc0fbb

Change-Id: I58f1f71dd4a8b4725205555531fa5d66284e3cd0
 2016-12-14 18:21:39 +00:00
Philip P. Moltmann
2f1bb85277 Only persist last Shared Preferences state 
am: 31d6889f4c

Change-Id: I0324e5e391d3d426cef8ef52ea04f529c5c7580f
 2016-12-14 18:21:33 +00:00
Julius D'souza
d8a6e8eaa2 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: 323f2dbc46  -s ours

Change-Id: Iec1380282c06bbe970c5e178143dede6939b8b0a
 2016-12-14 18:21:23 +00:00
Julius D'souza
a481fd31cf 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

Change-Id: Icf2354559cf4c0cac6d61d89378b00e9831e9e14
 2016-12-14 18:15:47 +00:00