drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
302,141 Commits 1 Branch 0 Tags
Commit Graph

302141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kwan
898385ed59 Check if the activity translucency was converted before converted back. 
am: 39dd370d8e

Change-Id: Ib0705da70acd8abceedd5c1deeacae5023032543
 2017-01-09 23:06:21 +00:00
TreeHugger Robot
6d7dc11e01 Merge "Check if the activity translucency was converted before converted back." into cw-f-dev 2017-01-09 22:59:53 +00:00
Eugene Susla
2ddcb077ac Merge "Unit test to keep a11y cache critical events up to date" 2017-01-09 22:59:39 +00:00
Joe Onorato
badde2af73 Hold a wake lock while DeviceIdleController is going idle. am: b08db484c2 am: e678f29684 
am: 854bff71c4

Change-Id: If29ff885cce767a54b2cc7435e76eecc8f9ec128
 2017-01-09 22:57:27 +00:00
Tao Wu
f7fee94d75 Remove unused variable. 
Code search show nobody referenced it and aosp image still compiles after
remove it.

Test: make -j18 systemimage userdataimage ramdisk

Change-Id: I3e37ea590610091b938296c999dceb3caf919906
Signed-off-by: Tao Wu <lepton@google.com>
 2017-01-09 14:53:16 -08:00
Joe Onorato
854bff71c4 Hold a wake lock while DeviceIdleController is going idle. am: b08db484c2 
am: e678f29684

Change-Id: I130a3b997915d6edf716d82cb614abb4b21ea7c3
 2017-01-09 22:52:53 +00:00
Joe Onorato
893e7ef681 Hold a wake lock while DeviceIdleController is going idle. am: b08db484c2 am: 1046331f89 
am: bf6b40dc64

Change-Id: If868a2bd68877caa5a156cdfb94cce93e5b441ab
 2017-01-09 22:52:51 +00:00
Joe Onorato
bf6b40dc64 Hold a wake lock while DeviceIdleController is going idle. am: b08db484c2 
am: 1046331f89

Change-Id: I229ab30185b793a1a8773e73c878347468a12814
 2017-01-09 22:47:52 +00:00
Joe Onorato
e678f29684 Hold a wake lock while DeviceIdleController is going idle. 
am: b08db484c2

Change-Id: I12a3f0a0edc1d8393267ef1ab34b650a7c1036f2
 2017-01-09 22:43:46 +00:00
Joe Onorato
1046331f89 Hold a wake lock while DeviceIdleController is going idle. 
am: b08db484c2

Change-Id: I7a1d1ea87541de8f0e12d687440efccc8956a5c1
 2017-01-09 22:43:24 +00:00
John Reck
1deac99c55 Support EGL_KHR_partial_update without EGL_EXT_buffer_age 
Bug: 31334677
Test: manual && hwuimacro --onscreen partialdamage

Change-Id: I9b346b4053ec12c8a78a143a4dc0e708c44888a2
 2017-01-09 14:35:37 -08:00
Jack Yu
9f60453361 Merge commit '5d14d99e434af815ed7fff224d178d3d72c164eb' into manual_merge_5d14d99e434a 
Test: manual
Change-Id: I228ed62db45eeb5d384049b5b0fef57b0bcf9ac6
 2017-01-09 14:33:59 -08:00
Peeyush Agarwal
d06030c515 Merge "Fix KeyboardShortcuts show" 2017-01-09 22:05:25 +00:00
Treehugger Robot
ccda81e58f Merge "Moved implicit intents into explicit intents" 2017-01-09 22:02:37 +00:00
Michael Kwan
39dd370d8e Check if the activity translucency was converted before converted back. 
Bug: 34084490
Change-Id: Ib04c76549a31c7e523649f9d284637d44d7477ae
 2017-01-09 13:43:52 -08:00
Joe Onorato
b08db484c2 Hold a wake lock while DeviceIdleController is going idle. 
The inputs to DeviceIdleController (alarm manager, sensors)
hold wake locks while they call it.  But then the real work
happens in a handler which is outside of the wakelock, so
listeners don't get a chance to run right away, which in
the case of NetworkPolicyManager means the device is in a
higher power state than it should be.

It's not clear that this will 100% fix the bug, because
NetworkPolicyManagerService also has its own internal
Handler, and isn't holding its own wakelock for this,
but this change allows NPMS to be fixed if it really
needed to be.

Bug: 31900521
Test: adb shell dumpsys deviceidle step ... adb shell dumpsys power has no wakelocks held
Change-Id: I799f45221a6b327e7f63745cadc95ca644c064c6
(cherry picked from commit 8f0e9cede145bbc1668e25cfd6f850fe3fde3ae3)
 2017-01-09 21:37:53 +00:00
Jeremy Joslin
9096948a1c Merge "Make REQUEST_NETWORK_SCORES signature only." am: 1f89f3d1da am: 99b73c61f2 am: 542f906448 
am: 005224f27d  -s ours

Change-Id: Ib699fa1e79563f0c23fe4c19142d0cfeb658baa7
 2017-01-09 21:27:36 +00:00
Jeremy Joslin
ad5277d793 Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED." am: 4c456d7ddf am: 542aad4c75 am: f91d9debef 
am: 6cf53d0ab8  -s ours

Change-Id: I7fa56d40aefeeedd17b6071691ebf9b52bf5778b
 2017-01-09 21:26:24 +00:00
Jeremy Joslin
005224f27d Merge "Make REQUEST_NETWORK_SCORES signature only." am: 1f89f3d1da am: 99b73c61f2 
am: 542f906448

Change-Id: I55dc42d95816e0edd2c570fe96dc724c180a3cd1
 2017-01-09 21:18:26 +00:00
Jeremy Joslin
6cf53d0ab8 Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED." am: 4c456d7ddf am: 542aad4c75 
am: f91d9debef

Change-Id: I7436278fa3eab064fe2b416c672bedaa300eb501
 2017-01-09 21:17:17 +00:00
Android Build Merger (Role)
b9df075a41 Merge changes from topic 'am-453b2166356e44c1a431040ac87bd428' 
* changes:
  Merge "Moved implicit intents into explicit intents" into nyc-mr1-dev-plus-aosp am: ad873323fc am: 01eeacdbe9  -s ours
  Moved implicit intents into explicit intents am: 6356b6e3c7 am: 005a5d609e  -s ours
 2017-01-09 21:10:26 +00:00
Jeremy Joslin
542f906448 Merge "Make REQUEST_NETWORK_SCORES signature only." am: 1f89f3d1da 
am: 99b73c61f2

Change-Id: I5959ba9a45dd3c895421b131fd34db6b37c6e405
 2017-01-09 21:09:09 +00:00
Jack Yu
eb97009d8d Merge "Moved implicit intents into explicit intents" into nyc-mr1-dev-plus-aosp am: ad873323fc 
am: 01eeacdbe9  -s ours

Change-Id: I049ec23acfa8e2c779802abcff0fe124b6edcaa0
 2017-01-09 21:08:53 +00:00
Ashutosh Joshi
484b4238b8 Merge "Remove Google nanoApp references from framework." 2017-01-09 21:08:41 +00:00
Jack Yu
5bf49d327a Moved implicit intents into explicit intents am: 6356b6e3c7 
am: 005a5d609e  -s ours

Change-Id: Iaffa35479a831669589da0888d8dc2d296fe9b00
 2017-01-09 21:07:51 +00:00
Jeremy Joslin
f91d9debef Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED." am: 4c456d7ddf 
am: 542aad4c75

Change-Id: I3b35ec04e65f6b14f75f266dfcf15c10a12a4d74
 2017-01-09 21:07:48 +00:00
Jeremy Joslin
99b73c61f2 Merge "Make REQUEST_NETWORK_SCORES signature only." 
am: 1f89f3d1da

Change-Id: I4fff314194584e78c86e3b0ae1de40fd7f2501f4
 2017-01-09 21:00:13 +00:00
Jeremy Joslin
542aad4c75 Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED." 
am: 4c456d7ddf

Change-Id: I441cae5096b922419763832d5b38faa95818e337
 2017-01-09 20:58:50 +00:00
Jack Yu
01eeacdbe9 Merge "Moved implicit intents into explicit intents" into nyc-mr1-dev-plus-aosp 
am: ad873323fc

Change-Id: I61f0266d3b98c39448339feada5f4e4f7e94fa61
 2017-01-09 20:58:24 +00:00
Jack Yu
005a5d609e Moved implicit intents into explicit intents 
am: 6356b6e3c7

Change-Id: I39ae9bb2b727ba1f8a9bf49f3f8da03b131207ba
 2017-01-09 20:58:15 +00:00
Sundeep Ghuman
8bc096c09d Cherrypick: Create ScoredNetwork Badging API changes. 
Defines an attribute bundles key to hold the badging curve, the
enums for badge values, and an API to retrieve a badge for a
specific RSSI.

OCL: ag/1727147
Bug: 33457699
Test: Unit tests
Change-Id: If9e8a60c4670b51c395fb501f55ddece8a72981e
Merged-In: If9e8a60c4670b51c395fb501f55ddece8a72981e
 2017-01-09 12:57:02 -08:00
Treehugger Robot
1f89f3d1da Merge "Make REQUEST_NETWORK_SCORES signature only." 2017-01-09 20:51:34 +00:00
Treehugger Robot
4c456d7ddf Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED." 2017-01-09 20:45:52 +00:00
TreeHugger Robot
ad873323fc Merge "Moved implicit intents into explicit intents" into nyc-mr1-dev-plus-aosp 2017-01-09 20:44:36 +00:00
Bill Yi
a8f7f312fc Import translations. DO NOT MERGE 
Change-Id: Ie38d9ebeab2777c7754fa967782960617be41d2f
Auto-generated-cl: translation import
 2017-01-09 12:35:02 -08:00
TreeHugger Robot
e2489c67e1 Merge "Using official names for clusters and sections." 2017-01-09 20:25:45 +00:00
TreeHugger Robot
fabf8e8187 Merge "ContextHubService: Remove unused using declaration" 2017-01-09 20:20:29 +00:00
TreeHugger Robot
93b785a90f Merge "Revert "Implement Account Discovery API."" 2017-01-09 20:04:52 +00:00
TreeHugger Robot
29c0a2c93d Merge "Do not report uptime to tron after runtime restart" 2017-01-09 19:56:16 +00:00
Mark Renouf
d5db4a22df Merge "Merge "Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN" into cw-f-dev am: 5df216f209 am: 1831698768" into nyc-mr2-dev-plus-aosp 
am: 426b84b35b

Change-Id: I98cdc7072e1fc95c0bb2893c12d7da1475d49f9e
 2017-01-09 19:52:36 +00:00
Mark Renouf
295f2d9c48 Merge "Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN" into cw-f-dev am: 5df216f209 am: 1831698768 
am: 9fdeaff3e9

Change-Id: I2ecf7f2fe3dac404119b4154dd7f3fe4c3bb6e7e
 2017-01-09 19:52:27 +00:00
Mark Renouf
fa17d3f753 Merge "Merge "Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN" into cw-f-dev am: 5df216f209 am: a7fdfa81b7" into nyc-mr2-dev-plus-aosp 
am: 0e47080499

Change-Id: I876a1cc6314762f92623e2c319a96a61dae183bc
 2017-01-09 19:50:39 +00:00
Mark Renouf
507d6f5704 Merge "Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN" into cw-f-dev am: 5df216f209 am: a7fdfa81b7 
am: 0544ccb751

Change-Id: Ic122e1c53c205bde9b9b7a4eac8b516f15e1ac9c
 2017-01-09 19:50:32 +00:00
Mark Renouf
2b219437f3 Merge "Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN am: 9b32a35aa7 am: bf30b430d4" into nyc-mr2-dev-plus-aosp 
am: 14caf48e0f

Change-Id: I8d8b238eeade815ef6ad75cbc779bc0871d7dd7e
 2017-01-09 19:48:40 +00:00
Mark Renouf
7fb756ddfe Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN am: 9b32a35aa7 am: bf30b430d4 
am: acb41426e4

Change-Id: I976e4f5220df5e74b47345e04d614c517fddfade
 2017-01-09 19:48:31 +00:00
Mark Renouf
d9d871ff58 Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN am: 9b32a35aa7 am: 7ef0b07465 
am: d5a1123109

Change-Id: Ie02c9f74fc93133a68940204420c48f92d4b352f
 2017-01-09 19:47:22 +00:00
Ashutosh Joshi
290c320024 Remove Google nanoApp references from framework. 
Remove references to Google specific code from the framework.
There is code that explictly deals only with Google Nanoapps on
very sepcific devices. Such code should not be in general Android
framework code.

Bug: 29336850
Test: GTS tests pass.
Change-Id: I8c25b0a5b732c36c4a56ce0c2b5d6abf3cb1aa01
 2017-01-09 11:45:28 -08:00
Calin Juravle
458c4115ec Merge "Some refactoring in BackgroundDexOptService." 2017-01-09 19:40:10 +00:00
TreeHugger Robot
e7e4998784 Merge "Updating PIP to match UX" 2017-01-09 19:33:09 +00:00
Android Build Merger (Role)
426b84b35b Merge "Merge "Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN" into cw-f-dev am: 5df216f209 am: 1831698768" into nyc-mr2-dev-plus-aosp 2017-01-09 19:33:06 +00:00