Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
472,153 Commits 3 Branches 0 Tags
e85d7667d7f7ff78472ca3bdfd11ea1df158faab
Commit Graph

472153 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
e85d7667d7 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 71f4215205 -s ours am: 07df9b6a6f -s ours am: 3b8d829b1b -s ours am skip reason: subject contains skip directive" into rvc-qpr-dev-plus-aosp 2020-03-01 15:45:30 +00:00
Automerger Merge Worker
6b481359b0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 71f4215205 -s ours am: 07df9b6a6f -s ours am: 3b8d829b1b -s ours 
am skip reason: subject contains skip directive

Change-Id: Ic6c37323f26414e6eb6d488d8b79bb4fc761ce4b
 2020-03-01 15:45:26 +00:00
Automerger Merge Worker
fad8e9cd9c [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 71f4215205 -s ours am: 370dfcf43d -s ours am: ec1aa2a93e -s ours 
am skip reason: subject contains skip directive

Change-Id: I8530998cdcf76948db40a304abe2df0cdb44499c
 2020-03-01 15:45:21 +00:00
Automerger Merge Worker
3b9a796b19 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 71f4215205 -s ours am: 07df9b6a6f -s ours am: b960acb5df -s ours 
am skip reason: subject contains skip directive

Change-Id: Icb045494887d45f432093062a8a22f489573ec15
 2020-03-01 15:45:15 +00:00
Automerger Merge Worker
3b8d829b1b [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 71f4215205 -s ours am: 07df9b6a6f -s ours 
am skip reason: subject contains skip directive

Change-Id: I22d189ab16b368dabea4605621bc7b87ae41c943
 2020-03-01 15:33:45 +00:00
Automerger Merge Worker
ec1aa2a93e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 71f4215205 -s ours am: 370dfcf43d -s ours 
am skip reason: subject contains skip directive

Change-Id: Ic93a2eaeb037d7659ec79dee7d83a04c689f3844
 2020-03-01 15:33:36 +00:00
Automerger Merge Worker
b960acb5df [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 71f4215205 -s ours am: 07df9b6a6f -s ours 
am skip reason: subject contains skip directive

Change-Id: Iff26e90a8389528fe346e9644e1e7f98d8952fa8
 2020-03-01 15:33:29 +00:00
Automerger Merge Worker
07df9b6a6f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 71f4215205 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ia394e78e018ff6dc064eb7df65e2fa6dde264b2c
 2020-03-01 15:24:09 +00:00
Automerger Merge Worker
370dfcf43d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 71f4215205 -s ours 
am skip reason: subject contains skip directive

Change-Id: I238b8a479fcff7742f75d59c19700051e3e0bb8c
 2020-03-01 15:24:07 +00:00
TreeHugger Robot
71f4215205 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-03-01 15:09:57 +00:00
Automerger Merge Worker
d824978f34 Merge "[automerger skipped] Merge "Revert "Update storage permission policy to use AppCompat APIs."" into rvc-dev am: 7d647467f5 am: 4f65eb6397 am: fc23beddb5 -s ours am skip reason: Change-Id I31d4b989aea3b73efb3a3634073ee06b88e3ee97 with SHA-1 51debb1f9b is in history" into rvc-qpr-dev-plus-aosp 2020-03-01 13:38:11 +00:00
Automerger Merge Worker
cd0534faa2 [automerger skipped] Merge "Revert "Update storage permission policy to use AppCompat APIs."" into rvc-dev am: 7d647467f5 am: 4f65eb6397 am: fc23beddb5 -s ours 
am skip reason: Change-Id I31d4b989aea3b73efb3a3634073ee06b88e3ee97 with SHA-1 51debb1f9b is in history

Change-Id: Ic31e67f6ea1a5fbf120dda0855cbec1d900d05f6
 2020-03-01 13:37:52 +00:00
Automerger Merge Worker
91136c4bb9 [automerger skipped] Merge "Revert "Update storage permission policy to use AppCompat APIs."" into rvc-dev am: 7d647467f5 am: 43c3ac2b57 am: db58d92a47 -s ours 
am skip reason: Change-Id I31d4b989aea3b73efb3a3634073ee06b88e3ee97 with SHA-1 51debb1f9b is in history

Change-Id: Ic453f108abd27eddad677ae8ed5d939beaa83491
 2020-03-01 13:37:49 +00:00
Automerger Merge Worker
6ff87a435e Merge "Revert "Update storage permission policy to use AppCompat APIs."" into rvc-dev am: 7d647467f5 am: 43c3ac2b57 am: 672962fce2 
Change-Id: Ib3a1236873518b3c21a6875c0ae6164ddc970f16
 2020-03-01 13:37:37 +00:00
Automerger Merge Worker
fc23beddb5 Merge "Revert "Update storage permission policy to use AppCompat APIs."" into rvc-dev am: 7d647467f5 am: 4f65eb6397 
Change-Id: Ib33d82faf56b254794971ff026bcf7d55cb41e1a
 2020-03-01 13:26:17 +00:00
Automerger Merge Worker
db58d92a47 Merge "Revert "Update storage permission policy to use AppCompat APIs."" into rvc-dev am: 7d647467f5 am: 43c3ac2b57 
Change-Id: I6eab69b595184dce18894d982790c8fc5f3e6c1d
 2020-03-01 13:26:11 +00:00
Automerger Merge Worker
672962fce2 Merge "Revert "Update storage permission policy to use AppCompat APIs."" into rvc-dev am: 7d647467f5 am: 43c3ac2b57 
Change-Id: Ie09ef7d2a943066e8ef5b205617ecb338b954c58
 2020-03-01 13:25:58 +00:00
Automerger Merge Worker
4f65eb6397 Merge "Revert "Update storage permission policy to use AppCompat APIs."" into rvc-dev am: 7d647467f5 
Change-Id: I0dd20bd23f0a1bf85597dcb6f1d7160661e8171a
 2020-03-01 13:14:10 +00:00
Automerger Merge Worker
43c3ac2b57 Merge "Revert "Update storage permission policy to use AppCompat APIs."" into rvc-dev am: 7d647467f5 
Change-Id: I239a09670d19628e817a999b82f13754350fc7b7
 2020-03-01 13:13:45 +00:00
Abhijeet Kaur
7d647467f5 Merge "Revert "Update storage permission policy to use AppCompat APIs."" into rvc-dev 2020-03-01 13:00:04 +00:00
Bill Yi
74f729bcf2 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I767cee4764b2667fe8a74025053385650d3bee30
 2020-03-01 00:23:47 -08:00
Automerger Merge Worker
5c510955ee Merge "Sanitize Bluetooth device names without regex" am: 6bd37ba788 am: b8f0a92e0b am: 65d3f63d76 am: f0e75d8d5e 
Change-Id: I9e3422c347751638f489670a01a2790d7b7f534f
 2020-03-01 04:10:01 +00:00
Automerger Merge Worker
f0e75d8d5e Merge "Sanitize Bluetooth device names without regex" am: 6bd37ba788 am: b8f0a92e0b am: 65d3f63d76 
Change-Id: I45dfe9a4cf9b904e4db888dcdf777224c8432aea
 2020-03-01 03:56:50 +00:00
Automerger Merge Worker
65d3f63d76 Merge "Sanitize Bluetooth device names without regex" am: 6bd37ba788 am: b8f0a92e0b 
Change-Id: I044fa2a33359b90724e68f89b1762e0e2b3b196a
 2020-03-01 03:47:30 +00:00
Automerger Merge Worker
b8f0a92e0b Merge "Sanitize Bluetooth device names without regex" am: 6bd37ba788 
Change-Id: I97c50cc31e681e53cc74d76803e3e24566b7e5dd
 2020-03-01 03:34:53 +00:00
Treehugger Robot
6bd37ba788 Merge "Sanitize Bluetooth device names without regex" 2020-03-01 03:21:38 +00:00
Automerger Merge Worker
a4fef6992c Merge "Merge "Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev am: 5dbabb62a6 am: 2ec01d4139" into rvc-d1-dev-plus-aosp am: 397ea5f0b3" into rvc-qpr-dev-plus-aosp 2020-03-01 00:26:16 +00:00
Automerger Merge Worker
9db79b14ec Merge "Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev am: 5dbabb62a6 am: 2ec01d4139" into rvc-d1-dev-plus-aosp am: 397ea5f0b3 
Change-Id: I933836c7c489ae86305946d367ac4d57eed7dd49
 2020-03-01 00:26:11 +00:00
Automerger Merge Worker
166c7b07f3 Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev am: 5dbabb62a6 am: 2ec01d4139 am: 4c9b6a74fd 
Change-Id: I25fb3750f1f840d1fd949472cf834ccf328772de
 2020-03-01 00:26:02 +00:00
Automerger Merge Worker
b4aba3db4f Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev am: 5dbabb62a6 am: 5cd20c9e30 am: a8624ea22b 
Change-Id: I96713be8fee17dc81f7c872a5211533a8181ddab
 2020-03-01 00:25:51 +00:00
Automerger Merge Worker
397ea5f0b3 Merge "Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev am: 5dbabb62a6 am: 2ec01d4139" into rvc-d1-dev-plus-aosp 2020-03-01 00:11:16 +00:00
Automerger Merge Worker
7614ba1e2e Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev am: 5dbabb62a6 am: 2ec01d4139 
Change-Id: I797dc8b53335dc0a64b25869e94405c77b5b2261
 2020-03-01 00:11:13 +00:00
Automerger Merge Worker
4c9b6a74fd Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev am: 5dbabb62a6 am: 2ec01d4139 
Change-Id: Ie185612bcc90f7c1811d6d8bf99e1140114babb5
 2020-03-01 00:11:07 +00:00
Automerger Merge Worker
a8624ea22b Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev am: 5dbabb62a6 am: 5cd20c9e30 
Change-Id: I61ae95c2980e6871dad2548131ceba660bc42d1c
 2020-03-01 00:11:07 +00:00
Automerger Merge Worker
5cd20c9e30 Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev am: 5dbabb62a6 
Change-Id: I87eab50ae534e584e3d5e0d4b2d66e87dee7442a
 2020-02-29 23:59:39 +00:00
Automerger Merge Worker
2ec01d4139 Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev am: 5dbabb62a6 
Change-Id: Ide7b036d0f551e50b37172256c2a9a1ee62c4ab9
 2020-02-29 23:59:34 +00:00
Paul Murphy
5dbabb62a6 Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev 2020-02-29 23:42:23 +00:00
Automerger Merge Worker
a2e1c10bd3 Merge changes from topic "am-f52d7c9e87f04a0aa79e1ff29e6613fe" into rvc-qpr-dev-plus-aosp 
* changes:
  Merge changes from topic "am-712d2cc7eeac4c51897ba4b5d23a5f9f" into rvc-d1-dev-plus-aosp am: 1d5aed603b
  [automerger skipped] DO NOT MERGE: Revert Move startInput for WINDOW_FOCUS_GAIN to background thread am: 344858dd9c -s ours am: 87a31d58be am: 21406384a7 am: 16cddc7e15
 2020-02-29 22:27:59 +00:00
Automerger Merge Worker
32d628ca08 Merge changes from topic "am-712d2cc7eeac4c51897ba4b5d23a5f9f" into rvc-d1-dev-plus-aosp am: 1d5aed603b 
Change-Id: I13dbed88a393bcdea438e847cf9abf8935f0d088
 2020-02-29 22:27:55 +00:00
Automerger Merge Worker
739b66def4 [automerger skipped] DO NOT MERGE: Revert Move startInput for WINDOW_FOCUS_GAIN to background thread am: 344858dd9c -s ours am: 87a31d58be am: 21406384a7 am: 16cddc7e15 
Change-Id: I07319cf21dd8cadd9b52e0d0af1e65b46b891bb2
 2020-02-29 22:27:50 +00:00
Automerger Merge Worker
bd63e9fd53 Merge changes from topic "revert-9783082-1574797358199-802c4081-VGXGMNZIXS" into qt-qpr1-dev am: a373984e96 am: d03d6628e4 am: 30b1246586 am: f9bb155fe2 
Change-Id: I8964b959a1959fe53e40a255f40f485f307eee47
 2020-02-29 22:27:47 +00:00
Automerger Merge Worker
e2a4fb03ac [automerger skipped] DO NOT MERGE: Revert Move startInput for WINDOW_FOCUS_GAIN to background thread am: 344858dd9c -s ours am: 87a31d58be am: fa49660101 am: 48b3c2cadd 
Change-Id: Iab156d7b877e99c38daa60fd5098d19af98b0e48
 2020-02-29 22:27:44 +00:00
Automerger Merge Worker
8ed66addea Merge changes from topic "revert-9783082-1574797358199-802c4081-VGXGMNZIXS" into qt-qpr1-dev am: a373984e96 am: d03d6628e4 am: 30b1246586 am: f35ccd22a1 
Change-Id: I2bfa3d9a0eff2a1f0ca3fb6245ec0a51dacfa11b
 2020-02-29 22:27:35 +00:00
Automerger Merge Worker
2d33c399bd [automerger skipped] DO NOT MERGE: Revert Move startInput for WINDOW_FOCUS_GAIN to background thread am: 344858dd9c -s ours am: 87a31d58be am: fa49660101 am: 0596cec192 
Change-Id: Ic30715c62ba0207311413e0489e9cd9a13cb9629
 2020-02-29 22:27:33 +00:00
Automerger Merge Worker
1d5aed603b Merge changes from topic "am-712d2cc7eeac4c51897ba4b5d23a5f9f" into rvc-d1-dev-plus-aosp 
* changes:
  Merge changes from topic "revert-9783082-1574797358199-802c4081-VGXGMNZIXS" into qt-qpr1-dev am: a373984e96 am: d03d6628e4 am: 3a954cda4d
  [automerger skipped] DO NOT MERGE: Revert Move startInput for WINDOW_FOCUS_GAIN to background thread am: 344858dd9c -s ours am: 87a31d58be am: 21406384a7
 2020-02-29 22:11:38 +00:00
Automerger Merge Worker
f9bb155fe2 Merge changes from topic "revert-9783082-1574797358199-802c4081-VGXGMNZIXS" into qt-qpr1-dev am: a373984e96 am: d03d6628e4 am: 30b1246586 
Change-Id: I181d4447e49aa4417963af91dffd80f5da8ee1aa
 2020-02-29 22:11:37 +00:00
Automerger Merge Worker
48b3c2cadd [automerger skipped] DO NOT MERGE: Revert Move startInput for WINDOW_FOCUS_GAIN to background thread am: 344858dd9c -s ours am: 87a31d58be am: fa49660101 
Change-Id: I81496d04dc11ec2d78c561b1ab9110d2a29ad957
 2020-02-29 22:11:34 +00:00
Automerger Merge Worker
d31695787f Merge changes from topic "revert-9783082-1574797358199-802c4081-VGXGMNZIXS" into qt-qpr1-dev am: a373984e96 am: d03d6628e4 am: 3a954cda4d 
Change-Id: I444cf6a674d0b49893d36294064de6766ea2d357
 2020-02-29 22:11:32 +00:00
Automerger Merge Worker
f35ccd22a1 Merge changes from topic "revert-9783082-1574797358199-802c4081-VGXGMNZIXS" into qt-qpr1-dev am: a373984e96 am: d03d6628e4 am: 30b1246586 
Change-Id: Ie77f920cc12ef692bb2c8214a4854b7b8c82c7d6
 2020-02-29 22:11:31 +00:00
Automerger Merge Worker
16cddc7e15 [automerger skipped] DO NOT MERGE: Revert Move startInput for WINDOW_FOCUS_GAIN to background thread am: 344858dd9c -s ours am: 87a31d58be am: 21406384a7 
Change-Id: I0635d1cf49a7eaff34eb4dc09c25e1e09f0d5d82
 2020-02-29 22:11:30 +00:00