Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
637,215 Commits 3 Branches 0 Tags
001aff2da31752012ab8a52559953c5b139b8cf9
Commit Graph

637215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Franz
001aff2da3 Merge "Create a new permission to override Overridable change ids" into sc-dev am: 16cd2836a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13988946

Change-Id: If9fa205c5bdf5d8f37846a84d55653ffd383604d
 2021-03-25 15:44:55 +00:00
Benjamin Franz
16cd2836a3 Merge "Create a new permission to override Overridable change ids" into sc-dev 2021-03-25 15:29:21 +00:00
Chiachang Wang
9003073f7e [automerger skipped] Merge "Add network created callback support" am: 6e55574e2b am: 9f90086a5d am: 71edf5fe40 -s ours am: 68e8b019f6 -s ours 
am skip reason: skip tag Change-Id I8c2ff7bd6980ae838abc5669f9419d62741b8666 with SHA-1 c516779578 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652209

Change-Id: I5352c6115d127da4208557c2ca665b3c561788b1
 2021-03-25 15:22:55 +00:00
Qi Wang
cff34c966c Merge "Fix the SuggestionSpan overwrite logic." into sc-dev am: 590d6a9d48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13966713

Change-Id: I82d62774115177699e521f5e72b010991fe9fe9c
 2021-03-25 15:22:27 +00:00
Chiachang Wang
68e8b019f6 [automerger skipped] Merge "Add network created callback support" am: 6e55574e2b am: 9f90086a5d am: 71edf5fe40 -s ours 
am skip reason: skip tag Change-Id I8c2ff7bd6980ae838abc5669f9419d62741b8666 with SHA-1 c516779578 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652209

Change-Id: Ie637f132849c0d4f20b65b4e6e3e4f7d1bdf141a
 2021-03-25 15:11:52 +00:00
Qi Wang
590d6a9d48 Merge "Fix the SuggestionSpan overwrite logic." into sc-dev 2021-03-25 15:09:59 +00:00
Kate Montgomery
360b30afce Merge "Revert "Dump location noteOp with location off"" 2021-03-25 15:08:15 +00:00
Paul Hu
89b684905f Merge "Add MOBILE_DATA_PREFERRED_APPS setting" into sc-dev am: 241dd6ef0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13990306

Change-Id: Ia75e9045292829c7558fa7f1e5c6a7fbca4781d2
 2021-03-25 15:07:16 +00:00
Remi NGUYEN VAN
5ac9bdb5bc Merge "Use connectivity APIs from framework-connectivity" into sc-dev am: 40b4495f8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13927655

Change-Id: I1428253765641a0bdbeea95eb68be488b796f87c
 2021-03-25 15:06:44 +00:00
Nataniel Borges
b9e6312347 Merge "Demote unstable assertions from presubmit" into sc-dev am: a8ca7f3ad2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13922486

Change-Id: I77bcb49d095ce871ec28df8507b006d7562f7545
 2021-03-25 15:06:14 +00:00
Paul Hu
241dd6ef0e Merge "Add MOBILE_DATA_PREFERRED_APPS setting" into sc-dev 2021-03-25 15:01:30 +00:00
Remi NGUYEN VAN
40b4495f8e Merge "Use connectivity APIs from framework-connectivity" into sc-dev 2021-03-25 14:51:55 +00:00
Nataniel Borges
a8ca7f3ad2 Merge "Demote unstable assertions from presubmit" into sc-dev 2021-03-25 14:49:13 +00:00
Joanne Chung
7f4c7608de Merge "Update View translation APIs." into sc-dev am: b6a9530dc1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13874869

Change-Id: Ibccd0a3b3c48200bbd9270213337e0dd5b486bf1
 2021-03-25 14:45:27 +00:00
Joanne Chung
b6a9530dc1 Merge "Update View translation APIs." into sc-dev 2021-03-25 14:31:40 +00:00
Patrick Baumann
43972a262c Merge "Exposes way to bypass user action on update" 2021-03-25 14:29:42 +00:00
Paul Hu
bafe6bfc6f Merge "Add PRIVATE_DNS_MODE setting setter" into sc-dev am: f02ab42507 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13992146

Change-Id: I713f3737469264188c1322228a136e91238679a4
 2021-03-25 14:22:31 +00:00
Chiachang Wang
71edf5fe40 Merge "Add network created callback support" am: 6e55574e2b am: 9f90086a5d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652209

Change-Id: Ia98837b70d22f5c15db77c54d58e142967bdd814
 2021-03-25 14:22:19 +00:00
Paul Hu
a23fbad78e Merge "Expose ConnectivitySettingsManager as module-lib API" into sc-dev am: fbcde0f713 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13947592

Change-Id: Ia995d97988acea8dcdfb2dbc6d8ab69909dbfaef
 2021-03-25 14:21:31 +00:00
Paul Hu
f02ab42507 Merge "Add PRIVATE_DNS_MODE setting setter" into sc-dev 2021-03-25 13:59:18 +00:00
Paul Hu
fbcde0f713 Merge "Expose ConnectivitySettingsManager as module-lib API" into sc-dev 2021-03-25 13:50:45 +00:00
Alison Cichowlas
da20ba6846 More WP chooser/resolver strings am: d19254d3ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13986753

Change-Id: Id8218e31198cd5ad70fafcb6ed1afa7a3e7c7117
 2021-03-25 13:44:46 +00:00
Dave Mankoff
43d0722c8d Merge "Address small comments from http://ag/13957078" into sc-dev am: 5f942daa45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13974654

Change-Id: Iebcc36bbde5305b7c61164928185c0726ba6d9a7
 2021-03-25 13:44:38 +00:00
Lucas Lin
a78938e08e [automerger skipped] Merge "Move FullScore to connectivity mainline module" am: c0e7ab7c3e am: cd3a5fa3af am: 111147f2d8 -s ours am: bed549f061 -s ours 
am skip reason: skip tag Change-Id I1ae795aa55afad1a2a74333cea52e4dcc3abc35a with SHA-1 a140688d5f is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653945

Change-Id: I4fa7f0cbaac0ed3e271c7f1382061282dd4ab29e
 2021-03-25 13:44:31 +00:00
Lucas Lin
ee524ca02a [automerger skipped] Merge "Add annotation for Vpn#getNetwork()" am: 8db8d890a0 am: d734d34703 am: a14890179b -s ours am: 1f8cf93aa4 -s ours 
am skip reason: skip tag Change-Id Ic52864003fbebd9f4e95d43fefc2e168437b0122 with SHA-1 1ef9b4d463 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653946

Change-Id: Iaf5fe8c3176cf82e8221a83753d9aa8c57834794
 2021-03-25 13:44:19 +00:00
Lucas Lin
e4c6b30597 [automerger skipped] Merge "Remove the usage of NETID_UNSET from Vpn.java" am: cf1dc9f287 am: e648a78c15 am: f08c2ce8a9 -s ours am: 4e5a7bfaa3 -s ours 
am skip reason: skip tag Change-Id I69d449705b1dc541287c72af8dc7705dc4733109 with SHA-1 2cc371c74b is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653929

Change-Id: Ie073c69cb35cb40d2b6c5dbce07d39aff99f6773
 2021-03-25 13:44:00 +00:00
Lucas Lin
ce7df68421 [automerger skipped] Merge "Expose some APIs from ConnectivityManager" am: f43adf215e am: de44994554 am: 82b3b456cd -s ours am: 94633a52ff -s ours 
am skip reason: skip tag Change-Id I1fb5ecfbe37878ba3534e6c6c7599ca29db2735c with SHA-1 9eae065a2e is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653936

Change-Id: Ibca74eff93c80901ecdfb055c5fd7d88ef285082
 2021-03-25 13:43:43 +00:00
Lucas Lin
f4e237339c [automerger skipped] Merge "Remove the usage of hidden API - setIsAvailable() from Vpn" am: 93b20febd4 am: 961a73e0c3 am: 172bc952aa -s ours am: df6aaa94f4 -s ours 
am skip reason: skip tag Change-Id I3b88f22fffde3dd4000d28342ed07209c7121a37 with SHA-1 02ec9e9d4a is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653934

Change-Id: Ifd1804c147b0e3ece053d2a63f6329d4d1ad277a
 2021-03-25 13:43:34 +00:00
Lucas Lin
1f71185e4a [automerger skipped] Merge changes Ic2357dcf,Iddf8c71a am: 1ff9b10f74 am: e3d28b9ad0 am: c9dddc84c0 -s ours am: 9326ba6115 -s ours 
am skip reason: skip tag Change-Id Ic2357dcfff3233e0dd17b48b0e376a5095ef60fa with SHA-1 ae04f625fe is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653939

Change-Id: I7e4f05800d8ee17a85e9af6ec19050d386776c2b
 2021-03-25 13:43:24 +00:00
lucaslin
be7f37b99c [automerger skipped] Expose NetworkScore to external caller am: 5aea42137f am: f53af56d1a am: e2dfce5a08 -s ours am: 32aca8849a -s ours 
am skip reason: skip tag Change-Id Iddf8c71a5f51a40bc6ff78626b3e8ee530d1b7eb with SHA-1 b90ff160cc is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653938

Change-Id: I1c1183ef366724b64f37bc66f5ea9039d7ccc676
 2021-03-25 13:43:21 +00:00
Lucas Lin
71b4ae2267 [automerger skipped] Merge changes I6d5dd0a8,I106b3e4f am: 276f8e6a70 am: db4eb02ecd am: b96e8a1c55 -s ours am: 8750dd182e -s ours 
am skip reason: skip tag Change-Id I6d5dd0a8c3879df7bdc1d58e36022045c303bb40 with SHA-1 83ca710aff is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653932

Change-Id: I94f4cc6511fb6468ed6333c5b935c90dce394b35
 2021-03-25 13:43:03 +00:00
lucaslin
8d2b44cc7d [automerger skipped] Remove unused import IConnectivityManager am: 6642bda243 am: 307a73be5b am: ab2da1d535 -s ours am: ce093c913f -s ours 
am skip reason: skip tag Change-Id I106b3e4f68b4e5610a238931aa3e81afdd927422 with SHA-1 cda16ed7ae is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653931

Change-Id: Ib14ed6c1372d3ab5363b6621eb5f66534cb26ca8
 2021-03-25 13:43:01 +00:00
Chiachang Wang
9f90086a5d Merge "Add network created callback support" am: 6e55574e2b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652209

Change-Id: Ibd2d575b5e3bdfc164c4721bc5bbb0c8b90601e0
 2021-03-25 13:42:54 +00:00
Lucas Lin
4e9eba1563 [automerger skipped] Merge "Use getAllInterfaceNames to get all interface names" am: c4c056b647 am: ab9c3f219f am: b2ae343b9c -s ours am: 300013aa1c -s ours 
am skip reason: skip tag Change-Id Id2b19dc5099355af69d23a6d99d2b7e6c0e1e88a with SHA-1 e7ee038a65 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653937

Change-Id: I23085eefa9baedf3e0e1801ccc8c917cea495144
 2021-03-25 13:42:33 +00:00
TreeHugger Robot
2fac796ef9 Merge "DMD: Also consider no votes when calculating specs" into sc-dev am: 037ab3a91a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13828547

Change-Id: I301eab71085f3d95357f48676e1b4b4759441903
 2021-03-25 13:41:39 +00:00
Alison Cichowlas
d19254d3ab More WP chooser/resolver strings 
Bug: 182361692
Test: atest ChooserActivityTest, ResolverActivityTest
Change-Id: I4838ca3a4c861aae3a7bfe3f2396470c3525d3b5
 2021-03-25 13:25:50 +00:00
Chiachang Wang
6e55574e2b Merge "Add network created callback support" 2021-03-25 13:22:17 +00:00
Nataniel Borges
47dd2e6f0b Demote unstable assertions from presubmit 
Test: atest FlickerTests WMShellFlickerTests
Bug: 183108736
Bug: 181630910
Bug: 183547024
Bug: 183402546
Change-Id: I5b8d4f9db126bd4c3c9a67327cdfad986f37891b
 2021-03-25 14:20:21 +01:00
Dave Mankoff
5f942daa45 Merge "Address small comments from http://ag/13957078" into sc-dev 2021-03-25 13:13:34 +00:00
paulhu
45515ca169 Add MOBILE_DATA_PREFERRED_APPS setting 
This setting is OEM upstream requirement for mobile data
preferred apps feature.

Bug: 171872461
Test: atest FrameworksNetTests
Change-Id: Ic5e0515b2b948de3d333c8d8e073d0b15514562a
 2021-03-25 13:13:15 +00:00
Lucas Lin
bed549f061 [automerger skipped] Merge "Move FullScore to connectivity mainline module" am: c0e7ab7c3e am: cd3a5fa3af am: 111147f2d8 -s ours 
am skip reason: skip tag Change-Id I1ae795aa55afad1a2a74333cea52e4dcc3abc35a with SHA-1 a140688d5f is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653945

Change-Id: I44f14ecf3c1e8f7af690e988c89197fe6cb2e4bf
 2021-03-25 13:12:00 +00:00
paulhu
37135512f8 Add PRIVATE_DNS_MODE setting setter 
Bug: 182538166
Test: atest FrameworksNetTests
Change-Id: If234426f041606c4881de1eca31b6f5bdb3c6bfe
 2021-03-25 13:11:54 +00:00
Lucas Lin
1f8cf93aa4 [automerger skipped] Merge "Add annotation for Vpn#getNetwork()" am: 8db8d890a0 am: d734d34703 am: a14890179b -s ours 
am skip reason: skip tag Change-Id Ic52864003fbebd9f4e95d43fefc2e168437b0122 with SHA-1 1ef9b4d463 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653946

Change-Id: I9f037314105a92d95394f55058bdbdeefd05b9c9
 2021-03-25 13:11:34 +00:00
Lucas Lin
4e5a7bfaa3 [automerger skipped] Merge "Remove the usage of NETID_UNSET from Vpn.java" am: cf1dc9f287 am: e648a78c15 am: f08c2ce8a9 -s ours 
am skip reason: skip tag Change-Id I69d449705b1dc541287c72af8dc7705dc4733109 with SHA-1 2cc371c74b is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653929

Change-Id: I02ac63b20048a4c91a821911c4db0b14805bdef3
 2021-03-25 13:10:55 +00:00
Lucas Lin
94633a52ff [automerger skipped] Merge "Expose some APIs from ConnectivityManager" am: f43adf215e am: de44994554 am: 82b3b456cd -s ours 
am skip reason: skip tag Change-Id I1fb5ecfbe37878ba3534e6c6c7599ca29db2735c with SHA-1 9eae065a2e is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653936

Change-Id: Id36817eef371fd456bbb4f95cd713e43b833bae9
 2021-03-25 13:10:18 +00:00
Lucas Lin
df6aaa94f4 [automerger skipped] Merge "Remove the usage of hidden API - setIsAvailable() from Vpn" am: 93b20febd4 am: 961a73e0c3 am: 172bc952aa -s ours 
am skip reason: skip tag Change-Id I3b88f22fffde3dd4000d28342ed07209c7121a37 with SHA-1 02ec9e9d4a is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653934

Change-Id: Ia5e3703fea761ffa0b2f04316c4398fc87075841
 2021-03-25 13:09:50 +00:00
Lucas Lin
9326ba6115 [automerger skipped] Merge changes Ic2357dcf,Iddf8c71a am: 1ff9b10f74 am: e3d28b9ad0 am: c9dddc84c0 -s ours 
am skip reason: skip tag Change-Id Ic2357dcfff3233e0dd17b48b0e376a5095ef60fa with SHA-1 ae04f625fe is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653939

Change-Id: Ib7ed1d9c595b30fadf6efee2ab2614197e156ce1
 2021-03-25 13:08:16 +00:00
lucaslin
32aca8849a [automerger skipped] Expose NetworkScore to external caller am: 5aea42137f am: f53af56d1a am: e2dfce5a08 -s ours 
am skip reason: skip tag Change-Id Iddf8c71a5f51a40bc6ff78626b3e8ee530d1b7eb with SHA-1 b90ff160cc is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653938

Change-Id: If0f542ea1a8a5dfe422cfc560f68abe7de05fb37
 2021-03-25 13:07:51 +00:00
Lucas Lin
8750dd182e [automerger skipped] Merge changes I6d5dd0a8,I106b3e4f am: 276f8e6a70 am: db4eb02ecd am: b96e8a1c55 -s ours 
am skip reason: skip tag Change-Id I6d5dd0a8c3879df7bdc1d58e36022045c303bb40 with SHA-1 83ca710aff is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653932

Change-Id: I3d8237e0619f7a63e3290609b9c9158d47d5830d
 2021-03-25 13:06:52 +00:00
lucaslin
ce093c913f [automerger skipped] Remove unused import IConnectivityManager am: 6642bda243 am: 307a73be5b am: ab2da1d535 -s ours 
am skip reason: skip tag Change-Id I106b3e4f68b4e5610a238931aa3e81afdd927422 with SHA-1 cda16ed7ae is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653931

Change-Id: Ieda65b79b54a9f01f7c50b4c6c01c8cd9a0e34a8
 2021-03-25 13:06:43 +00:00