Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
439,760 Commits 3 Branches 0 Tags
11fef4e7d4447bbf5a285f2f04ffbc47419e0bbd
Commit Graph

439760 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ryan Mitchell
11fef4e7d4 Merge "Fix security issue in DynamicRefTable::load." 2019-08-26 16:06:34 +00:00
TreeHugger Robot
007ecbb859 Merge "Revert "Delete FalsingManager tests that are very flaky."" 2019-08-26 14:32:03 +00:00
Bill Yi
6f9af93503 Merge "Import translations. DO NOT MERGE" 2019-08-26 04:38:17 +00:00
TreeHugger Robot
06f32dc333 Merge "Fix that Bluetooth device should not duplicate in the list" 2019-08-26 03:39:48 +00:00
Roshan Pius
845465c8e4 [automerger skipped] Merge "NetworkStackClient: Refactor network stack process interaction" into qt-qpr1-dev-plus-aosp 
am: b402c73c4d -s ours
am skip reason: change_id I673581b0067b9a3f72dd68a3ab622c18183ebd2e with SHA1 7e6f5f5e08 is in history

Change-Id: I44b41fac6c90895ee796b1f363c2ae65213303c6
 2019-08-25 20:33:51 -07:00
TreeHugger Robot
b402c73c4d Merge "NetworkStackClient: Refactor network stack process interaction" into qt-qpr1-dev-plus-aosp 2019-08-26 03:12:07 +00:00
Jimmy Chen
9d4f41f27c Merge "wifi: common name support in PPS-MO profile" 2019-08-26 02:00:59 +00:00
Bill Yi
8bd25aff2f [automerger skipped] Import translations. DO NOT MERGE am: 8e24ea2b4c -s ours 
am: 7c761462a6 -s ours
am skip reason: subject contains skip directive

Change-Id: I7b77a3fa16845d90f8a678be3b656d0a56f2ea86
 2019-08-25 07:19:26 -07:00
Bill Yi
7c761462a6 [automerger skipped] Import translations. DO NOT MERGE 
am: 8e24ea2b4c -s ours
am skip reason: subject contains skip directive

Change-Id: I2b9ce480ada705dafe132ddfd993bfdcc73c8664
 2019-08-25 07:07:36 -07:00
Bill Yi
8e24ea2b4c Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I360dde2e3d4eb2abc98c8bd3163ff8d9f7e41112
 2019-08-25 01:08:16 -07:00
Bill Yi
86bddb6b61 Import translations. DO NOT MERGE 
Change-Id: I1b367d8c64b9e83c549950410c306a04d0f68c72
Auto-generated-cl: translation import
 2019-08-25 00:19:04 -07:00
Robert Shih
56c4d1520e Merge "Add statsd atom for Legacy DRM usage" 2019-08-25 04:28:31 +00:00
Bill Yi
2524ed33c6 Merge "Import translations. DO NOT MERGE" 2019-08-24 20:59:18 +00:00
TreeHugger Robot
f05b3e95ee Merge "Added flag to toggle acquire messages on keyguard" 2019-08-24 10:47:49 +00:00
TreeHugger Robot
4222abd060 Merge "Handles null outInfo in deleteSystemPackageLI" 2019-08-24 10:45:46 +00:00
TreeHugger Robot
2941abbc9b Merge "Revert "The source of subtree chagnes should be the viewParent"" 2019-08-24 10:41:25 +00:00
TreeHugger Robot
4c30dd52a9 Merge "Import translations. DO NOT MERGE" 2019-08-24 10:37:32 +00:00
TreeHugger Robot
254ebf6127 Merge "AttestedKeyPair: Address API review comments" 2019-08-24 10:31:29 +00:00
TreeHugger Robot
aaab0a09f1 Merge "Import translations. DO NOT MERGE" 2019-08-24 10:20:31 +00:00
Nagaraja
49ba074773 Merge "Added Part & Addr Constants." am: f5d5de8a0f am: 633db92447 am: 40efe816dd am: e83d4f6c7d 
am: f7db1c403e

Change-Id: I2acd0021601741c9a7975f900d5d8ea36c4124cf
 2019-08-24 01:44:24 -07:00
Anna Trostanetski
a6fe3996e1 Merge "Rename android.compat.IPlatformCompat" am: ee716a23a2 am: 81af0fc8bb am: 20f25166c3 am: 884ef46cdc 
am: 8649477e74

Change-Id: I1722a3c2fc9444b4e05932bb287d5ccd389f1493
 2019-08-24 01:40:24 -07:00
Tobias Thierer
237f58d0d1 Merge "Tweak RuntimeInit docs around MimeMap registration." am: bc6371727c am: 41438c3730 am: b0c5a7af5a am: bc59f857aa 
am: eb2a053326

Change-Id: Ib5ae1da4687531c71d24f2c9a1d0dba776ebd719
 2019-08-24 01:37:23 -07:00
Oscar Shu
70ee8b5c86 Merge "avoid generating reserved local MACs" am: e5d5b73109 am: 65a98b4002 am: 4f05f46f13 am: 02142d5462 
am: edeb0313b7

Change-Id: If0fdc7bd46f711714986440a9a905f2ccb154830
 2019-08-24 01:33:53 -07:00
Tobias Thierer
89accb0841 Merge "Merge "Move default MimeMap implementation to frameworks." am: 19c3bdc88a am: 3f1d5d92fc am: 1b6d718387 am: 4999ce080d" into qt-qpr1-dev-plus-aosp 
am: 867daa7d82

Change-Id: I8ff51aa59aeebda8d117e5142100b9b86ccbfac9
 2019-08-24 01:14:13 -07:00
Mike Ma
8a88548504 Merge "Add an API to dump incident report for dumpstate" 2019-08-24 06:16:15 +00:00
TreeHugger Robot
4b7b1af6b1 Merge "Make TextClock.refresh() a public API" 2019-08-24 06:06:55 +00:00
TreeHugger Robot
1ae707d394 Merge "UserController.switchUser accepts MANAGE_USERS" 2019-08-24 05:46:23 +00:00
Santos Cordon
70307c53cb Merge "Merge "Hold Display suspend blocker until doze starts" into qt-r1-dev am: 48a86feefe am: 23cdf1a48c" into qt-qpr1-dev-plus-aosp 
am: cb7ebeeca5

Change-Id: Iac71f18a29fd9e7835e123766698c99f3554975d
 2019-08-23 22:34:48 -07:00
Neil Fuller
5e39293aaf Merge "Merge "resolve merge conflicts of bd592e0439 to stage-aosp-master" into stage-aosp-master am: 6948bc8ce1 am: 2b52914445 am: 7a5ba3f59d" into qt-qpr1-dev-plus-aosp 
am: 1ff9dc9948

Change-Id: Ic6cc5a29b02b7746fd9e55b3a5c803ffe097d91f
 2019-08-23 22:32:09 -07:00
Remi NGUYEN VAN
3807423671 Merge "[automerger skipped] Merge "Remove DeviceConfig usage from NetworkStackClient" into stage-aosp-master am: d3f8bbc6c0 -s ours am: 56ac6f1ee7 -s ours am: a8aa5abfa0 -s ours 
am: 2da6de044c -s ours
am skip reason: change_id I423ca6ebb328f49b170baae0da9b8409a6429fcb with SHA1 7086666dea is in history

Change-Id: I050ca2f73920a20bb3ebd6419144ea39498253c0
 2019-08-23 22:29:31 -07:00
Bill Yi
ffeb94f704 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: b7ad07adad -s ours am: 7002e2a912 -s ours 
am: e6495d4830 -s ours
am skip reason: subject contains skip directive

Change-Id: I514e2f0dfda041042ed79496bcc49afe0e4d603b
 2019-08-23 22:26:44 -07:00
Adrian Salido
8756d94745 Merge "Merge "Revert "Hold Display suspend blocker until doze starts"" into qt-r1-dev am: c5441b2894 am: 83392f441d" into qt-qpr1-dev-plus-aosp 
am: 2c916241d5

Change-Id: Ia42e9efc9fdea85566811dbeb01ef5693dee71dd
 2019-08-23 22:24:00 -07:00
Yi Kong
191ab39230 Merge "Merge "[automerger skipped] Disable modernize-use-trailing-return-type clang-tidy check am: fbafa5162a -s ours am: 68770715e3 -s ours am: 594180c68c -s ours 
am: 9607b9445c -s ours
am skip reason: change_id I7fbc10fb9044904f85f9a1ec6cf712ce3cec0a79 with SHA1 a0914d81ef is in history

Change-Id: Iddc46cb146493da9c9cace5a816fd886b8cd905b
 2019-08-23 22:21:15 -07:00
Lucas Dupin
f871c4ab44 [automerger skipped] Merge "Only delay bouncer if bypass is off" into qt-r1-dev am: 255777af56 -s ours am: 56b04b1721 -s ours 
am: cfb337a15b -s ours
am skip reason: change_id I5ca00ebacda2c893bf62d5c882fe0a244b77f4fc with SHA1 d969b76224 is in history

Change-Id: If57c169e8606467c4ddd12c565f47e05af062666
 2019-08-23 22:18:28 -07:00
Bill Yi
a311d59b5a [automerger skipped] Import translations. DO NOT MERGE am: 1c99d77a36 -s ours am: 5c56a5e691 -s ours 
am: c40d399613 -s ours
am skip reason: subject contains skip directive

Change-Id: I14631fcef87a92250d680d83b1b6e2c84bde83c8
 2019-08-23 22:15:39 -07:00
Long Ling
05eccbc392 Merge changes from topic "device_config_for_display_90" into qt-r1-dev am: 36da9bb9ff am: 6060198534 
am: 90fd03e874

Change-Id: If4f7f84259a57231cb7f7d481dd2b25f13382780
 2019-08-23 22:12:51 -07:00
Long Ling
7b69ac4b2b [automerger skipped] DO NOT MERGE Move device config key high_refresh_rate_blacklist to display_manager am: 6f13f12213 -s ours am: 318adae023 
am: 74ee0f2db3 -s ours
am skip reason: subject contains skip directive

Change-Id: Icb6c12b2a22378746c252cee482d334c8936d1ad
 2019-08-23 22:08:28 -07:00
Long Ling
ab7e828ef3 [automerger skipped] DO NOT MERGE DeviceConfig: Add Name space and keys for Display Manager am: 66e9298ac6 am: 8da4630093 
am: cacba7e6e6 -s ours
am skip reason: subject contains skip directive

Change-Id: I90a86c3a374c2ad8d5c127361a1962aea70843b0
 2019-08-23 22:08:24 -07:00
Nagaraja
f7db1c403e Merge "Added Part & Addr Constants." am: f5d5de8a0f am: 633db92447 am: 40efe816dd 
am: e83d4f6c7d

Change-Id: I58a2924860ac78bf9611fdb887b7ea7e0a313caa
 2019-08-23 22:06:14 -07:00
Anna Trostanetski
8649477e74 Merge "Rename android.compat.IPlatformCompat" am: ee716a23a2 am: 81af0fc8bb am: 20f25166c3 
am: 884ef46cdc

Change-Id: I11d25c6de70389b9f8fb74b914a247bca224e631
 2019-08-23 22:04:54 -07:00
Tobias Thierer
eb2a053326 Merge "Tweak RuntimeInit docs around MimeMap registration." am: bc6371727c am: 41438c3730 am: b0c5a7af5a 
am: bc59f857aa

Change-Id: I09976c187805459c01101e2c8dd1b056fc2067a5
 2019-08-23 22:04:24 -07:00
Sasha Smundak
1863f3edaf Merge "Android.bp file to convert current.api to XML format." into qt-dev-plus-aosp am: 73c6f3caa3 am: ce8fa14129 
am: f650335abe

Change-Id: Idebb5f45147707cb0cd22be98f5321b84d280239
 2019-08-23 22:04:00 -07:00
Oscar Shu
edeb0313b7 Merge "avoid generating reserved local MACs" am: e5d5b73109 am: 65a98b4002 am: 4f05f46f13 
am: 02142d5462

Change-Id: Ib6e9917c555ab4ef5769aaca1ef6987dfbc185c1
 2019-08-23 22:03:56 -07:00
Yi Kong
3d9f74b317 [automerger skipped] Fix android-cloexec-pipe clang-tidy warning am: 1fa946a2f2 am: 975bd46c43 
am: 5b14cee5d2 -s ours
am skip reason: change_id Iee772b5c3ed5e2af481e479dab19030f8419290a with SHA1 f61e2167d5 is in history

Change-Id: I4fdb08ddf233185bad25bfeecbb0b8a33022b190
 2019-08-23 22:00:09 -07:00
Yi Kong
58c20f9020 [automerger skipped] Disable modernize-use-trailing-return-type clang-tidy check am: a0914d81ef am: 2b952530f3 
am: a4c4948089 -s ours
am skip reason: change_id I7fbc10fb9044904f85f9a1ec6cf712ce3cec0a79 with SHA1 fc8e666d67 is in history

Change-Id: I34c40560f51a9ad3f388eeb6abfdb8504e294171
 2019-08-23 21:56:54 -07:00
Android Build Merger (Role)
867daa7d82 Merge "Merge "Move default MimeMap implementation to frameworks." am: 19c3bdc88a am: 3f1d5d92fc am: 1b6d718387 am: 4999ce080d" into qt-qpr1-dev-plus-aosp 2019-08-24 04:55:41 +00:00
Tobias Thierer
011723e214 Merge "Move default MimeMap implementation to frameworks." am: 19c3bdc88a am: 3f1d5d92fc am: 1b6d718387 
am: 4999ce080d

Change-Id: Id03e7205f9f89ed34e53a4db7ff42f47138f1b48
 2019-08-23 21:54:32 -07:00
Android Build Merger (Role)
cb7ebeeca5 Merge "Merge "Hold Display suspend blocker until doze starts" into qt-r1-dev am: 48a86feefe am: 23cdf1a48c" into qt-qpr1-dev-plus-aosp 2019-08-24 04:50:27 +00:00
Santos Cordon
66ee479ef3 Merge "Hold Display suspend blocker until doze starts" into qt-r1-dev am: 48a86feefe 
am: 23cdf1a48c

Change-Id: Idb4bcdfca436af96c664fcd9c112c97f91bab15b
 2019-08-23 21:49:53 -07:00
Android Build Merger (Role)
1ff9dc9948 Merge "Merge "resolve merge conflicts of bd592e0439 to stage-aosp-master" into stage-aosp-master am: 6948bc8ce1 am: 2b52914445 am: 7a5ba3f59d" into qt-qpr1-dev-plus-aosp 2019-08-24 04:48:38 +00:00