Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
380,225 Commits 3 Branches 0 Tags
1c6b934c7e6dc18a2cd3e4fd7eb0c0eb641fbc78
Commit Graph

380225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atanas Kirilov
1c6b934c7e Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into oc-dev am: 8b047ec8a2 am: 245cc0559f am: 0f4152e815 am: 387e0bf842 
am: 2f2e754b6a

Change-Id: I7bc2c16a41cab48e0d0d0ade0f636ac1e2eead7a
 2018-06-27 20:36:15 -07:00
TreeHugger Robot
43ef2a1b69 Merge "Stop invoke initAppOps in Camera default constructor." 2018-06-28 03:28:32 +00:00
Atanas Kirilov
4a355a58df [automerger skipped] Merge "Backport Prevent shortcut info package name spoofing" into oc-dev am: c6dbcc137e am: dcc95b94f8 am: ab3235ad5b am: 5fb8ac2010 
am: 97238d791f  -s ours

Change-Id: Icf3a98f193be43b1b82e88c2ec88fe1aa3f33093
 2018-06-27 20:25:02 -07:00
Atanas Kirilov
fb91800122 Merge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into oc-dev am: 000036eb4c am: 00bf4c5b5c am: 2b8be3932b am: d63cfc9261 
am: 3d058ea5a0

Change-Id: Ice3a7ee74d4a4bf18ba6fa8a00022ecdd9eaa386
 2018-06-27 20:16:08 -07:00
Atanas Kirilov
d9f179d770 [automerger skipped] Merge "Backporting of b/77821568" into oc-dev am: 9774459633 am: f3f6e2f9ee am: 1b67b798cf -s ours am: 1028b26d46 -s ours 
am: b88cac5977  -s ours

Change-Id: I0d8cecbe603a931fa874de932da94fc566bba728
 2018-06-27 20:02:39 -07:00
TreeHugger Robot
2b2cf4415d Merge "P is for PAINT." 2018-06-28 02:44:32 +00:00
Atanas Kirilov
2f2e754b6a Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into oc-dev am: 8b047ec8a2 am: 245cc0559f am: 0f4152e815 
am: 387e0bf842

Change-Id: I6ed4b999bfc3b434971609088457aa56d042db99
 2018-06-27 19:15:59 -07:00
Atanas Kirilov
97238d791f Merge "Backport Prevent shortcut info package name spoofing" into oc-dev am: c6dbcc137e am: dcc95b94f8 am: ab3235ad5b 
am: 5fb8ac2010

Change-Id: I12a8c77d01f3c8655c735c9408f164f0e894f6db
 2018-06-27 18:55:18 -07:00
Atanas Kirilov
387e0bf842 Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into oc-dev am: 8b047ec8a2 am: 245cc0559f 
am: 0f4152e815

Change-Id: I49e413e32d9db706eaa5a56fc84f9998a47b8a9e
 2018-06-27 18:48:55 -07:00
Atanas Kirilov
3d058ea5a0 Merge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into oc-dev am: 000036eb4c am: 00bf4c5b5c am: 2b8be3932b 
am: d63cfc9261

Change-Id: Id96bf7c84b589849d1436cb2c926df9e8d0d09dd
 2018-06-27 18:45:18 -07:00
Atanas Kirilov
5fb8ac2010 Merge "Backport Prevent shortcut info package name spoofing" into oc-dev am: c6dbcc137e am: dcc95b94f8 
am: ab3235ad5b

Change-Id: I1152d43ce2eec7cd5692d61df725bcd8b455aca3
 2018-06-27 18:35:46 -07:00
Atanas Kirilov
d63cfc9261 Merge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into oc-dev am: 000036eb4c am: 00bf4c5b5c 
am: 2b8be3932b

Change-Id: I2ad28e6a718946be431fcda0cbb8efa719b46db3
 2018-06-27 18:29:36 -07:00
Atanas Kirilov
0f4152e815 Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into oc-dev am: 8b047ec8a2 
am: 245cc0559f

Change-Id: I904c603cf4838f12067b9548058b85e53a843fd0
 2018-06-27 18:27:10 -07:00
Atanas Kirilov
b88cac5977 [automerger skipped] Merge "Backporting of b/77821568" into oc-dev am: 9774459633 am: f3f6e2f9ee am: 1b67b798cf -s ours 
am: 1028b26d46  -s ours

Change-Id: I78396616a3fa15cdf91bcee465bc4027be201898
 2018-06-27 18:10:46 -07:00
Atanas Kirilov
245cc0559f Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into oc-dev 
am: 8b047ec8a2

Change-Id: I0c6522feec4b1baccf3c2c8ffb0d79bdebedb9b2
 2018-06-27 17:57:17 -07:00
Atanas Kirilov
ab3235ad5b Merge "Backport Prevent shortcut info package name spoofing" into oc-dev am: c6dbcc137e 
am: dcc95b94f8

Change-Id: I23209ea505140a48177b1b4fe78d36699240653e
 2018-06-27 17:37:57 -07:00
Atanas Kirilov
dcc95b94f8 Merge "Backport Prevent shortcut info package name spoofing" into oc-dev 
am: c6dbcc137e

Change-Id: Ib3becad73fadba2be82e44bc6fb4afc3c1921a6a
 2018-06-27 17:25:10 -07:00
Atanas Kirilov
2b8be3932b Merge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into oc-dev am: 000036eb4c 
am: 00bf4c5b5c

Change-Id: I5cfc94bc9781c29a423a95a43d775e6bea6271b7
 2018-06-27 17:21:25 -07:00
TreeHugger Robot
4a6df3f5e8 Merge "Reduce overview proxy connection backoff time to hide back faster" 2018-06-28 00:09:54 +00:00
Atanas Kirilov
1028b26d46 [automerger skipped] Merge "Backporting of b/77821568" into oc-dev am: 9774459633 am: f3f6e2f9ee 
am: 1b67b798cf  -s ours

Change-Id: I1f209b583519e73c0912db7583b34324003a5526
 2018-06-27 17:09:53 -07:00
Kevin Chyn
d021cd25fe Merge "Add kchyn to SystemUI owners" 2018-06-28 00:02:19 +00:00
TreeHugger Robot
a88791a72a Merge "Update notification settings Javadoc links." 2018-06-28 00:01:59 +00:00
Chavi Weingarten
b45e676e96 Merge "Don't keep current IME target if it's being removed." 2018-06-28 00:00:24 +00:00
Atanas Kirilov
00bf4c5b5c Merge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into oc-dev 
am: 000036eb4c

Change-Id: Ic71e3f93036902b2d9452c05e7cdb6e4df2fb0e0
 2018-06-27 16:56:45 -07:00
Atanas Kirilov
1b67b798cf Merge "Backporting of b/77821568" into oc-dev am: 9774459633 
am: f3f6e2f9ee

Change-Id: I1445ecb89dba24df5e89089fbf0aff308331aea0
 2018-06-27 16:56:36 -07:00
Atanas Kirilov
f3f6e2f9ee Merge "Backporting of b/77821568" into oc-dev 
am: 9774459633

Change-Id: Ie0d176b94d15be65918b5f67bf9ed7f49f632def
 2018-06-27 16:42:36 -07:00
Atanas Kirilov
8b047ec8a2 Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into oc-dev 
* changes:
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a am: 06848a3f8f skipped: c3e741e530
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a am: 06848a3f8f
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a
  RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing
 2018-06-27 23:29:41 +00:00
Atanas Kirilov
c6dbcc137e Merge "Backport Prevent shortcut info package name spoofing" into oc-dev 2018-06-27 23:26:08 +00:00
Atanas Kirilov
000036eb4c Merge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into oc-dev 
* changes:
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e am: 0eda2602cd skipped: 430c4395a3
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e am: 0eda2602cd
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c
  RESTRICT AUTOMERGE: Backporting of b/77821568
 2018-06-27 23:25:42 +00:00
Atanas Kirilov
9774459633 Merge "Backporting of b/77821568" into oc-dev 2018-06-27 23:25:27 +00:00
Kevin Chyn
a586d05fc1 Add kchyn to SystemUI owners 
Test: builds
Change-Id: I2774c26b01085180d5a9cbe3e578f73d48c869e9
 2018-06-27 16:19:33 -07:00
Kurt Marcinkiewicz
df88e0d434 Merge "Fix NPE when country is absent from user's locale" 2018-06-27 23:10:55 +00:00
Dan Sandler
d1f9f5338f P is for PAINT. 
Bug: 109925861
Test: adb shell am start \
        -a android.intent.action.MAIN \
        -c com.android.internal.category.PLATLOGO
Change-Id: Ic3020007c716be264e9523d6dbae9e13a95fa571
 2018-06-27 18:58:14 -04:00
Tyler Gunn
2eb94adb0f Merge "ImsMultiEndPoint - Sip Notify Change" am: af228ca978 am: 206bacb18b 
am: 05902faa8b

Change-Id: I1b1c55250e2f3e636e2dea6e35cca7c08051b4b7
 2018-06-27 15:48:44 -07:00
Tyler Gunn
05902faa8b Merge "ImsMultiEndPoint - Sip Notify Change" am: af228ca978 
am: 206bacb18b

Change-Id: I66364e0e5213410595ec110c422125b2c93f0411
 2018-06-27 15:38:13 -07:00
Matthew Ng
9608748b5e Reduce overview proxy connection backoff time to hide back faster 
Switching to guest user would show a dialog to continue or start the
guest profile again and this would show the back button. At the same
time the connection is being established with the launcher again. First
time would sometimes fail causing a timeout of 5 secs before trying to
reconnect again. During the 5 sec timeout the back button would continue
to be visible until it reconnects and hides it. If this is reduced to 1
sec then reconnection would occur quicker and as a result hide the back
button.

Fixes: 109662462
Test: switch to guest user, immediately press continue and wait for back
button disappear

Change-Id: Id81b7f175834fb1eae8a0787674bbc130c91a5a2
 2018-06-27 15:37:35 -07:00
Jeff Sharkey
ed71f10907 Merge "Give StrictMode more bits to work with." 2018-06-27 22:33:07 +00:00
Tyler Gunn
206bacb18b Merge "ImsMultiEndPoint - Sip Notify Change" 
am: af228ca978

Change-Id: I49bcddccfa561ee4464ebcb2f8b07612b8e95e65
 2018-06-27 15:28:10 -07:00
TreeHugger Robot
771df97a1a Merge "Import translations. DO NOT MERGE" 2018-06-27 22:26:26 +00:00
Kevin Chyn
02bcebede4 Merge "6/n: Have FaceService extend BiometricService" 2018-06-27 22:09:01 +00:00
TreeHugger Robot
4b66a0f8f8 Merge "Import translations. DO NOT MERGE" 2018-06-27 21:57:14 +00:00
TreeHugger Robot
f1d391374b Merge "Remove unused resources." 2018-06-27 21:56:21 +00:00
Andrew Zeng
6badc28ecc Update notification settings Javadoc links. 
Change-Id: If9ed94473fb5c0607fa44b9a42c62837878ffd00
 2018-06-27 21:09:15 +00:00
Nathan Harold
a402e4136d Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID" into stage-aosp-master am: 998c416213 
am: d9a7a59007

Change-Id: I2e577b36fbc50f7df92d1e0aad9e837219944597
 2018-06-27 13:21:36 -07:00
Nathan Harold
d9a7a59007 Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID" into stage-aosp-master 
am: 998c416213

Change-Id: I352b53ac10fed126a9e585bc1d3de1430a8cff4f
 2018-06-27 13:12:23 -07:00
Brad Ebinger
8f891beaa7 Merge "Telephony: Introduce a base class for ISMS.aidl." am: f03b8e2471 am: 0397b9b65d 
am: 42bf3bef2b

Change-Id: I0de662b8429769129017ea5549d590a335842540
 2018-06-27 13:10:48 -07:00
Nathan Harold
998c416213 Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID" into stage-aosp-master 2018-06-27 20:02:59 +00:00
Tyler Gunn
af228ca978 Merge "ImsMultiEndPoint - Sip Notify Change" 2018-06-27 20:02:37 +00:00
Brad Ebinger
42bf3bef2b Merge "Telephony: Introduce a base class for ISMS.aidl." am: f03b8e2471 
am: 0397b9b65d

Change-Id: Ib946404b724ddfaceae06eb5d6026137052dcb7b
 2018-06-27 12:55:04 -07:00
Brad Ebinger
0397b9b65d Merge "Telephony: Introduce a base class for ISMS.aidl." 
am: f03b8e2471

Change-Id: I2c155c6bb46baa411f531e411f86efe0e56c20dc
 2018-06-27 12:46:39 -07:00