Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
413,496 Commits 3 Branches 0 Tags
cb62f8be1689c6eb07ef87f429ecf4f14a9db005
Commit Graph

413496 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Thierer
cb62f8be16 Merge "Merge changes I4e32a588,I202c5653 am: 003ab94333 am: b7ca85651f" into qt-dev-plus-aosp 
am: eb553b0df7

Change-Id: I5db1636a8c694e8b10c04800e7959747304c6b1b
 2019-04-08 14:54:22 -07:00
Bookatz
3672ed7304 Merge "Merge "UserRestrictionsUtil.isValidRestriction wtfs" into qt-dev am: a126a24c52" into qt-dev-plus-aosp 
am: 3f176785c5

Change-Id: Idd5f4618e6fdb73121ba2746bee91636fece7241
 2019-04-08 14:39:54 -07:00
Android Build Merger (Role)
cc9dd574ea Merge "Merge "[automerger skipped] Merge "Improved the debug message" am: cacfab6728 am: 253a139102 -s ours am: 718d5723b0 -s ours am skip reason: change_id If786d51b35380f606bc388e29a441bb24a2792e0 with SHA1 0c92c23951 is in history" 2019-04-08 21:28:54 +00:00
Jack Yu
12687e7c29 Merge "[automerger skipped] Merge "Improved the debug message" am: cacfab6728 am: 253a139102 -s ours 
am: 718d5723b0 -s ours
am skip reason: change_id If786d51b35380f606bc388e29a441bb24a2792e0 with SHA1 0c92c23951 is in history

Change-Id: I8d85d94af99802728441860a429263cacb7802ba
 2019-04-08 14:28:32 -07:00
Miguel de Dios
ce032b6769 Merge "Revert a bad merge from ag/6938423" 2019-04-08 21:24:36 +00:00
Amith Yamasani
d7a780cac2 Merge "[automerger skipped] Merge "Fix for NetworkStats/Telephony deadlock" am: 0d4445f1e0 am: 24fc368617 -s ours 
am: 8bbd520899 -s ours
am skip reason: change_id I9e8449e5a75db616e646f55c930ff82982fc9083 with SHA1 d78542bb52 is in history

Change-Id: I80311e518c083ac26eddd471f7ba15b52d2c94a6
 2019-04-08 14:20:03 -07:00
Android Build Merger (Role)
cf63408050 Merge "Merge "[automerger skipped] Merge "Move NetworkStatsFactory into service directory" am: 48294e098f am: ee6ed6914f -s ours am: 3427f091e0 -s ours am skip reason: change_id Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 with SHA1 061cec7755 is in history" 2019-04-08 21:11:40 +00:00
Chenbo Feng
50954a9c09 Merge "[automerger skipped] Merge "Move NetworkStatsFactory into service directory" am: 48294e098f am: ee6ed6914f -s ours 
am: 3427f091e0 -s ours
am skip reason: change_id Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 with SHA1 061cec7755 is in history

Change-Id: Ica19aba40268a7e4facbc35cb108ab9fdc1c1ada
 2019-04-08 14:11:16 -07:00
TreeHugger Robot
3c270c8937 Merge "Import translations. DO NOT MERGE" 2019-04-08 21:09:54 +00:00
Nathan Harold
2ecdcb6f21 Revert a bad merge from ag/6938423 
Bug: 130174575
Test: none
Change-Id: I7684f9e06f4d226010448e5520965a8733c43073
Merged-In: I7684f9e06f4d226010448e5520965a8733c43073
(cherry picked from commit 12f75864a2)
 2019-04-08 21:07:23 +00:00
Bill Yi
8263c86878 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6b539282c2 -s ours 
am: f32bcf72b6 -s ours
am skip reason: subject contains skip directive

Change-Id: I1874b6ccb4ce4957e55573e3aca9bc65dd904c19
 2019-04-08 14:02:23 -07:00
Bill Yi
43eb7fd5df [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 7581837e06 -s ours 
am: 2538206e20 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia1ba5ba206d776f123d05617cdabb50209085af4
 2019-04-08 14:00:28 -07:00
Etan Cohen
c79fba8664 Merge "[AWARE] Add unit test - fix hashing bug" into qt-dev am: 6d98837eb6 
am: 0e37a546fe

Change-Id: Ie6cb8ce301cb94db106a05815385626dd0d74e5a
 2019-04-08 13:55:01 -07:00
Tobias Thierer
53f0af2992 Merge changes I4e32a588,I202c5653 into qt-dev am: 79dd28f874 
am: b5b5e3f200

Change-Id: I143053674811ac38e02170c64632177b2cdbb69b
 2019-04-08 13:43:23 -07:00
TreeHugger Robot
eb0e0c3b3c Merge "iorap: Add a JobService for idle maintenance trace compilations" 2019-04-08 20:31:45 +00:00
Jorim Jaggi
cf5b5ac636 Merge "Protect against null drawable" into qt-dev am: 85e35eb118 
am: 23a9e4d20f

Change-Id: I5856f2b1a914772f290b385b2f9eb424c19740dd
 2019-04-08 13:17:52 -07:00
TreeHugger Robot
2588af8441 Merge "Make an Android-specific copy of Skia's Null GL interface" 2019-04-08 19:57:58 +00:00
Android Build Merger (Role)
e0be81a9bb Merge "Merge "Merge "Opportunistic Sub Grouping Keys in CarrierConfig" am: 6a9faeee7e am: 03c007dcde" into qt-dev-plus-aosp am: f99863ee31" 2019-04-08 19:46:57 +00:00
Nathan Harold
c609be28df Merge "Merge "Opportunistic Sub Grouping Keys in CarrierConfig" am: 6a9faeee7e am: 03c007dcde" into qt-dev-plus-aosp 
am: f99863ee31

Change-Id: Idc9fd2126ba05592a5ca532ed82d313748625f55
 2019-04-08 12:45:28 -07:00
Android Build Merger (Role)
0c04c4a88f Merge "Merge "Merge "Revert "Revert "Update MbmsDownloadServiceBase to reflect implements IInterface""" am: 412e701ff2 am: 346b610db6" into qt-dev-plus-aosp am: 0f77d41968" 2019-04-08 19:25:55 +00:00
Tor Norbye
12de13352a Merge "Merge "Revert "Revert "Update MbmsDownloadServiceBase to reflect implements IInterface""" am: 412e701ff2 am: 346b610db6" into qt-dev-plus-aosp 
am: 0f77d41968

Change-Id: If685f33bf0826f7055f692b3e3cdd0bb4dc44979
 2019-04-08 12:25:05 -07:00
Android Build Merger (Role)
eb553b0df7 Merge "Merge changes I4e32a588,I202c5653 am: 003ab94333 am: b7ca85651f" into qt-dev-plus-aosp 2019-04-08 19:21:44 +00:00
Tobias Thierer
b6e63b4b68 Merge changes I4e32a588,I202c5653 am: 003ab94333 
am: b7ca85651f

Change-Id: I055eeb1cdbda900d4eb6215f414827cf89dcc52b
 2019-04-08 12:21:20 -07:00
Android Build Merger (Role)
3f176785c5 Merge "Merge "UserRestrictionsUtil.isValidRestriction wtfs" into qt-dev am: a126a24c52" into qt-dev-plus-aosp 2019-04-08 19:17:40 +00:00
Bookatz
93bf279e9c Merge "UserRestrictionsUtil.isValidRestriction wtfs" into qt-dev 
am: a126a24c52

Change-Id: I4149d09e8e2a8311c3085ecb39d7bc0ebcc19491
 2019-04-08 12:17:20 -07:00
Android Build Merger (Role)
718d5723b0 Merge "[automerger skipped] Merge "Improved the debug message" am: cacfab6728 am: 253a139102 -s ours am skip reason: change_id If786d51b35380f606bc388e29a441bb24a2792e0 with SHA1 0c92c23951 is in history" into qt-dev-plus-aosp 2019-04-08 19:16:54 +00:00
Jack Yu
def98e2c41 [automerger skipped] Merge "Improved the debug message" am: cacfab6728 
am: 253a139102 -s ours
am skip reason: change_id If786d51b35380f606bc388e29a441bb24a2792e0 with SHA1 0c92c23951 is in history

Change-Id: I44cdc1f9a77cab58c341a1cd03c7551e99946a14
 2019-04-08 12:16:24 -07:00
Android Build Merger (Role)
8bbd520899 Merge "[automerger skipped] Merge "Fix for NetworkStats/Telephony deadlock" am: 0d4445f1e0 am: 24fc368617 -s ours am skip reason: change_id I9e8449e5a75db616e646f55c930ff82982fc9083 with SHA1 d78542bb52 is in history" into qt-dev-plus-aosp 2019-04-08 19:11:54 +00:00
Android Build Merger (Role)
fede8b4273 Merge "Merge "Fix job persistence & re-inflation" into qt-dev am: ac54e30fe5 am: 0feb1ec9d5" 2019-04-08 19:11:53 +00:00
Christopher Tate
aba4aee374 Merge "Fix job persistence & re-inflation" into qt-dev am: ac54e30fe5 
am: 0feb1ec9d5

Change-Id: I34bdfa807964fd36cb2612085264cf75b3c04c8b
 2019-04-08 12:11:28 -07:00
Amith Yamasani
0d835c50b3 [automerger skipped] Merge "Fix for NetworkStats/Telephony deadlock" am: 0d4445f1e0 
am: 24fc368617 -s ours
am skip reason: change_id I9e8449e5a75db616e646f55c930ff82982fc9083 with SHA1 d78542bb52 is in history

Change-Id: Ia496e4e78cec60895d792976a47ff02a799bb03f
 2019-04-08 12:11:24 -07:00
Android Build Merger (Role)
3427f091e0 Merge "[automerger skipped] Merge "Move NetworkStatsFactory into service directory" am: 48294e098f am: ee6ed6914f -s ours am skip reason: change_id Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 with SHA1 061cec7755 is in history" into qt-dev-plus-aosp 2019-04-08 19:07:03 +00:00
Android Build Merger (Role)
fa2ad8b180 Merge "Merge "Merge "Adding documentation to getElapsedRealtimeUncertaintyNanos following api council guidance." into qt-dev am: 433bb84545" into qt-dev-plus-aosp am: 8633941abf" 2019-04-08 19:06:53 +00:00
Chenbo Feng
4708ff609b [automerger skipped] Merge "Move NetworkStatsFactory into service directory" am: 48294e098f 
am: ee6ed6914f -s ours
am skip reason: change_id Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 with SHA1 061cec7755 is in history

Change-Id: I419ae9923a510c9691c8c88911ac45fe76846166
 2019-04-08 12:06:35 -07:00
TreeHugger Robot
92e142101a Merge "Import translations. DO NOT MERGE" 2019-04-08 19:06:26 +00:00
Pierre Fite-Georgel
5ce049398c Merge "Merge "Adding documentation to getElapsedRealtimeUncertaintyNanos following api council guidance." into qt-dev am: 433bb84545" into qt-dev-plus-aosp 
am: 8633941abf

Change-Id: Ie958927bc8bc32e5dd23ca0f6fdac11845af93b4
 2019-04-08 12:06:25 -07:00
TreeHugger Robot
4a391613c3 Merge "Import translations. DO NOT MERGE" 2019-04-08 19:05:56 +00:00
TreeHugger Robot
a126a24c52 Merge "UserRestrictionsUtil.isValidRestriction wtfs" into qt-dev 2019-04-08 19:03:25 +00:00
Bill Yi
f32bcf72b6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: 6b539282c2 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib93de383188359401795d7ae686f2dce1e3389ca
 2019-04-08 12:02:52 -07:00
Bill Yi
2538206e20 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: 7581837e06 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie1a046188604e09f875d970b20fcfeb87cb69a8e
 2019-04-08 11:51:07 -07:00
Etan Cohen
0e37a546fe Merge "[AWARE] Add unit test - fix hashing bug" into qt-dev 
am: 6d98837eb6

Change-Id: I86b8cf8745dfb8566c8e39c5f022e829eb90faf7
 2019-04-08 11:49:46 -07:00
Android Build Merger (Role)
c91b915bbb Merge "Merge "Merge "Add dependency on libdl_android" am: fb4396b6bd am: 09ff0f7a9b" into qt-dev-plus-aosp am: 46a1d47f5b" 2019-04-08 18:47:22 +00:00
Tobias Thierer
b5b5e3f200 Merge changes I4e32a588,I202c5653 into qt-dev 
am: 79dd28f874

Change-Id: Ie97b9e48b8972fe0fcfd3eb761caeee6c8a9b095
 2019-04-08 11:41:23 -07:00
TreeHugger Robot
6b539282c2 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-04-08 18:37:50 +00:00
dimitry
acbc540287 Merge "Merge "Add dependency on libdl_android" am: fb4396b6bd am: 09ff0f7a9b" into qt-dev-plus-aosp 
am: 46a1d47f5b

Change-Id: I2245b8b39983edcf105eab1674f44d57d8851cd7
 2019-04-08 11:37:02 -07:00
TreeHugger Robot
7581837e06 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-04-08 18:26:46 +00:00
Etan Cohen
6d98837eb6 Merge "[AWARE] Add unit test - fix hashing bug" into qt-dev 2019-04-08 18:21:58 +00:00
Android Build Merger (Role)
691f879752 Merge "Merge changes Ic4eb56fc,I7ba66213,I4b4dba44 into qt-dev am: 15777f204d am: 3862860765" 2019-04-08 18:17:52 +00:00
Roshan Pius
a659a53a8c Merge changes Ic4eb56fc,I7ba66213,I4b4dba44 into qt-dev am: 15777f204d 
am: 3862860765

Change-Id: Iadc4ebfa9b385de843fa560c240324cc3b545638
 2019-04-08 11:17:22 -07:00
Tobias Thierer
79dd28f874 Merge changes I4e32a588,I202c5653 into qt-dev 
* changes:
  Make MediaHTTPConnection thread safe.
  Revert "MediaHTTPConnection: move connection states into an inner class"
 2019-04-08 18:15:39 +00:00