Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
433,355 Commits 3 Branches 0 Tags
6be829aec0a7ff6de75fdc96a03e4b2ee6169762
Commit Graph

433355 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
6be829aec0 Import translations. DO NOT MERGE 
Change-Id: I05c9c5b4eac846680cc7411fd7aa2c8e49150262
Auto-generated-cl: translation import
 2019-06-29 16:42:23 -07:00
Philip P. Moltmann
5f165b619f [automerger skipped] Merge "Disable historical appops" into qt-dev am: 16128cc7a2 am: 4f7f78cce5 
am: 92eb0205a2 -s ours
am skip reason: change_id I6debd3cbb6768b256eb558a81ba13efea375769b with SHA1 1353bc5b76 is in history

Change-Id: I3fde4bacffac16c78b1fd0ce2d857442230eefec
 2019-06-28 21:57:49 -07:00
Eugene Susla
c9f04b94b1 [automerger skipped] Merge "[DO NOT MERGE] Guard against launching permission backup/restore twice per request" into qt-dev am: 40c5864445 am: 230c3cfaab 
am: 45983c90c2 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibb9c3b9cd93f8b2cec5ba960afdb953c8005bd1f
 2019-06-28 21:50:08 -07:00
Eugene Susla
1df08d4a01 [automerger skipped] [DO NOT MERGE] Guard against launching permission backup/restore twice per request am: 8c2fb0ea1e am: 2f27997760 
am: 9099351807 -s ours
am skip reason: subject contains skip directive

Change-Id: I8218ac48b042ff0f25e473948ec954695d376679
 2019-06-28 21:42:03 -07:00
Wale Ogunwale
95e1436563 Merge "Reland: Clear transitions for app windows display change." into qt-dev am: bf4eee2181 am: 8aa1dd7096 
am: d3612005a3

Change-Id: Ifa8712434f48bab14a35335e046aee67339f46df
 2019-06-28 21:31:00 -07:00
Philip P. Moltmann
92eb0205a2 Merge "Disable historical appops" into qt-dev am: 16128cc7a2 
am: 4f7f78cce5

Change-Id: I0ebc8196a2b8cfbd45cb77b2e3affc2b5e649888
 2019-06-28 21:06:12 -07:00
Eugene Susla
45983c90c2 Merge "[DO NOT MERGE] Guard against launching permission backup/restore twice per request" into qt-dev am: 40c5864445 
am: 230c3cfaab

Change-Id: I6cb9d9e4eef3237f4fbdbb05c98d9f1953fd2b2d
 2019-06-28 21:02:42 -07:00
Eugene Susla
9099351807 [DO NOT MERGE] Guard against launching permission backup/restore twice per request am: 8c2fb0ea1e 
am: 2f27997760

Change-Id: I0965137830b3a605062846eafebd832269436cfa
 2019-06-28 21:01:49 -07:00
TreeHugger Robot
55f43ef860 Merge "Remove lite optimization from protos" 2019-06-29 03:49:46 +00:00
Philip P. Moltmann
4f7f78cce5 Merge "Disable historical appops" into qt-dev 
am: 16128cc7a2

Change-Id: I5f3701c4510057aa69dec50c3dbae6c8fce860e8
 2019-06-28 20:48:36 -07:00
Wale Ogunwale
b87855f60b Merge "Reland: Clear transitions for app windows display change." into qt-dev am: bf4eee2181 am: c5116d9d30 
am: d14d6bc218

Change-Id: I0fbbc927ad82ed7159cd156288a569241cdf90ab
 2019-06-28 20:48:21 -07:00
Eugene Susla
230c3cfaab Merge "[DO NOT MERGE] Guard against launching permission backup/restore twice per request" into qt-dev 
am: 40c5864445

Change-Id: I42f6363f3037da833e70d31f8cda096dfe5832c8
 2019-06-28 20:42:04 -07:00
Eugene Susla
2f27997760 [DO NOT MERGE] Guard against launching permission backup/restore twice per request 
am: 8c2fb0ea1e

Change-Id: Ibfd0a70b91eb6ae13b8ad6506e02314521c36084
 2019-06-28 20:42:01 -07:00
TreeHugger Robot
16128cc7a2 Merge "Disable historical appops" into qt-dev 2019-06-29 03:28:31 +00:00
Bryan Ferris
4675762f47 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct argument order in permission check" into pi-dev am: b2964b2956 -s ours am: 8b98bdc834 am: 6b4e794ccd 
am: e74647d677 -s ours
am skip reason: subject contains skip directive

Change-Id: I75f9b0c3145812ea00b576bebd7edbbd5cdbf02a
 2019-06-28 20:25:22 -07:00
Wale Ogunwale
d3612005a3 Merge "Reland: Clear transitions for app windows display change." into qt-dev am: bf4eee2181 
am: 8aa1dd7096

Change-Id: I8c93b09d77df678fe6ff305579c41b31802c6d9e
 2019-06-28 20:23:33 -07:00
Wale Ogunwale
d14d6bc218 Merge "Reland: Clear transitions for app windows display change." into qt-dev am: bf4eee2181 
am: c5116d9d30

Change-Id: I2018b395d7242a9a6e5e8a6b5be61e771fe2c2b9
 2019-06-28 20:15:14 -07:00
Shuzhen Wang
f8d5408a59 Merge "Camera: Clarify manual capture behavior for logical camera" into qt-dev am: 6da414a8f6 am: 6f14111467 
am: 4e5cb18d53

Change-Id: Ib629b75c2c2c802ff256f97ca870ba91af68a54a
 2019-06-28 20:10:23 -07:00
Bryan Ferris
83b93675f7 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct argument order in permission check" into pi-dev am: b2964b2956 -s ours am: 8b98bdc834 am: 7945d755aa 
am: 6a39d14d6d -s ours
am skip reason: subject contains skip directive

Change-Id: I9c2c4aa47b979afc965043d41a424c51fcbad681
 2019-06-28 20:08:24 -07:00
TreeHugger Robot
40c5864445 Merge "[DO NOT MERGE] Guard against launching permission backup/restore twice per request" into qt-dev 2019-06-29 02:56:35 +00:00
Shuzhen Wang
27379787e2 Merge "Camera: Clarify manual capture behavior for logical camera" into qt-dev am: 6da414a8f6 am: 028b5789b6 
am: c88ead7d18

Change-Id: I72f1631555665ad31c989f3fa0945afda5a6586e
 2019-06-28 19:55:08 -07:00
Wale Ogunwale
8aa1dd7096 Merge "Reland: Clear transitions for app windows display change." into qt-dev 
am: bf4eee2181

Change-Id: Id28ab24b939f8e5ca1a234a5076611775b874257
 2019-06-28 19:44:44 -07:00
Lucas Dupin
a87d60929e Merge "Do not unregister lift when prox is covered" into qt-r1-dev am: e2c873275b 
am: 78aec06815

Change-Id: I8a6f22f8e634f6ba21344dcec1d1d668e2ea65b1
 2019-06-28 19:39:37 -07:00
Wale Ogunwale
c5116d9d30 Merge "Reland: Clear transitions for app windows display change." into qt-dev 
am: bf4eee2181

Change-Id: Iaa00b08d68fece06fbd58af10b988e60b2c468ec
 2019-06-28 19:38:42 -07:00
TreeHugger Robot
5a5fba2825 Merge "Remove ARC termination when System Audio Mode is turned off" 2019-06-29 02:25:14 +00:00
TreeHugger Robot
bf4eee2181 Merge "Reland: Clear transitions for app windows display change." into qt-dev 2019-06-29 01:49:22 +00:00
Bryan Ferris
e74647d677 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct argument order in permission check" into pi-dev am: b2964b2956 -s ours am: 8b98bdc834 
am: 6b4e794ccd

Change-Id: If4663fd9f5ed8980090d55602cffb0e5f2054b16
 2019-06-28 18:39:06 -07:00
Shuzhen Wang
4e5cb18d53 Merge "Camera: Clarify manual capture behavior for logical camera" into qt-dev am: 6da414a8f6 
am: 6f14111467

Change-Id: I522d1d316a04b1d143e0a586cdcb224ac9c7c55a
 2019-06-28 18:34:18 -07:00
Bryan Ferris
6a39d14d6d [automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct argument order in permission check" into pi-dev am: b2964b2956 -s ours am: 8b98bdc834 
am: 7945d755aa

Change-Id: Id340b7199d6656225d72bcfbf32f736ef2501f11
 2019-06-28 18:26:54 -07:00
Shuzhen Wang
c88ead7d18 Merge "Camera: Clarify manual capture behavior for logical camera" into qt-dev am: 6da414a8f6 
am: 028b5789b6

Change-Id: Ie19cfb44eaf5d958778633ba8f2b4881b722b1b4
 2019-06-28 18:22:20 -07:00
Hongwei Wang
44db8c302b Merge "Explicitly sets accessibility order of PiP menu actions" 2019-06-29 01:20:05 +00:00
Lucas Dupin
78aec06815 Merge "Do not unregister lift when prox is covered" into qt-r1-dev 
am: e2c873275b

Change-Id: Ic4c127978c1d6d0f3e6ba03c211e9937f1ec8df6
 2019-06-28 18:17:49 -07:00
Kavi Gupta
85008dc1aa Merge "Merge "Add JVMTI agent to dump/reset JaCoCo coverage information" am: edf7470e0b am: 7762c4aa6c am: c1a4da00c6" into qt-r1-dev-plus-aosp 
am: 6fc9e6ddbe

Change-Id: I15f02e8aa92bd63a4deee49a2a19b1d308b87c0c
 2019-06-28 18:00:54 -07:00
Mathew Inwood
16df3b4394 Merge "Restore some greylist entries." into qt-dev am: f4535c8d51 am: f405e83cdc 
am: 221e037810

Change-Id: I4427239baf9adaf7d9bb8d76d2ad03c0509ad0c6
 2019-06-28 17:57:37 -07:00
Fabian Kozynski
cfe5fcc407 Merge "Fixes for CBRS" into qt-r1-dev am: 65e4bc410d 
am: 5cb4433c53

Change-Id: Ie273d2e31ea55b592fb2cf020f98fce2bb18eb2e
 2019-06-28 17:56:49 -07:00
Bryan Ferris
7945d755aa [automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct argument order in permission check" into pi-dev am: b2964b2956 -s ours 
am: 8b98bdc834

Change-Id: I24041b45319d49a19b52f189bda07c322b02e99e
 2019-06-28 17:55:50 -07:00
Bryan Ferris
6b4e794ccd [automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct argument order in permission check" into pi-dev am: b2964b2956 -s ours 
am: 8b98bdc834

Change-Id: I1d753056c171bec25bc29e488f9b630067cf4405
 2019-06-28 17:54:17 -07:00
Shuzhen Wang
6f14111467 Merge "Camera: Clarify manual capture behavior for logical camera" into qt-dev 
am: 6da414a8f6

Change-Id: I2ade92a130cc6267a51802633f970d906891d5a6
 2019-06-28 17:48:51 -07:00
Bryan Ferris
8b98bdc834 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct argument order in permission check" into pi-dev 
am: b2964b2956 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifd5eb4109d1eca28aee7004b0625f51b1c9d203b
 2019-06-28 17:39:07 -07:00
Shuzhen Wang
028b5789b6 Merge "Camera: Clarify manual capture behavior for logical camera" into qt-dev 
am: 6da414a8f6

Change-Id: Ic7abd99805b450f0a1d1acbd2a0cd03c185e3a83
 2019-06-28 17:33:50 -07:00
Eugene Susla
8c2fb0ea1e [DO NOT MERGE] Guard against launching permission backup/restore twice per request 
It looks like there is some case where AbstractRemoteService would #run the
same PendingRequest the second time which violates AsyncTask assumption.

Fixes: 135986503
Test: atest android.permission.cts.PermissionControllerTest
Change-Id: I2d072714ee0fad3c365ff7eb191d690056c0931a
 2019-06-29 00:20:09 +00:00
Lucas Dupin
e2c873275b Merge "Do not unregister lift when prox is covered" into qt-r1-dev 2019-06-29 00:13:34 +00:00
Beverly
017f3294af Merge "Return true if there were plugin sensors available" into qt-r1-dev am: deb772499f 
am: 174c31409c

Change-Id: Ia5376519944471c6d82ec2f29e02b6cc91988c3a
 2019-06-28 16:59:47 -07:00
Bryan Ferris
b2964b2956 Merge "[RESTRICT AUTOMERGE] Correct argument order in permission check" into pi-dev 2019-06-28 23:59:16 +00:00
Android Build Merger (Role)
6fc9e6ddbe Merge "Merge "Add JVMTI agent to dump/reset JaCoCo coverage information" am: edf7470e0b am: 7762c4aa6c am: c1a4da00c6" into qt-r1-dev-plus-aosp 2019-06-28 23:54:17 +00:00
TreeHugger Robot
6da414a8f6 Merge "Camera: Clarify manual capture behavior for logical camera" into qt-dev 2019-06-28 23:54:09 +00:00
Kavi Gupta
a02b046558 Merge "Add JVMTI agent to dump/reset JaCoCo coverage information" am: edf7470e0b am: 7762c4aa6c 
am: c1a4da00c6

Change-Id: I6b0623318a13f47139efd96e9361d060992edf0f
 2019-06-28 16:53:18 -07:00
Mathew Inwood
221e037810 Merge "Restore some greylist entries." into qt-dev am: f4535c8d51 
am: f405e83cdc

Change-Id: Iaf7191c0b8564d9fa0a8b9e8dce3e0a41bc34928
 2019-06-28 16:52:53 -07:00
Fabian Kozynski
5cb4433c53 Merge "Fixes for CBRS" into qt-r1-dev 
am: 65e4bc410d

Change-Id: I8d90c69aa52f76bbc5ffae5f9883f3ca81bd323c
 2019-06-28 16:48:14 -07:00
Andrew Sapperstein
ec016d73a4 Merge "Allow granting URI permissions to com.android.settings.module_licenses." into qt-dev am: 9dd0c5628b am: e2232f9690 
am: d9bd0a1ef8

Change-Id: I1f962a0fcdd2c841b0da4d0c31025c65a05d0956
 2019-06-28 16:47:46 -07:00