Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
632,158 Commits 3 Branches 0 Tags
bed549f061b096ba99610d17616a7c702e052d14
Commit Graph

632158 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Lucas Lin
300013aa1c [automerger skipped] Merge "Use getAllInterfaceNames to get all interface names" am: c4c056b647 am: ab9c3f219f am: b2ae343b9c -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: I42520f8831d37b49a4c8d96d0db0092b9ed90ad0
 2021-03-25 13:05:36 +00:00
TreeHugger Robot
037ab3a91a Merge "DMD: Also consider no votes when calculating specs" into sc-dev 2021-03-25 12:54:25 +00:00
Lucas Lin
111147f2d8 Merge "Move FullScore to connectivity mainline module" am: c0e7ab7c3e am: cd3a5fa3af 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653945

Change-Id: I87eac6749f099bd70c554fa3172c8bb971c3c997
 2021-03-25 12:39:58 +00:00
Lucas Lin
a14890179b Merge "Add annotation for Vpn#getNetwork()" am: 8db8d890a0 am: d734d34703 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653946

Change-Id: Iaad97aa7b05f7583fc740d0bdaeffd8f23566086
 2021-03-25 12:39:43 +00:00
Lucas Lin
f08c2ce8a9 Merge "Remove the usage of NETID_UNSET from Vpn.java" am: cf1dc9f287 am: e648a78c15 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653929

Change-Id: I5e2dbb8cc31939b1fdc8abc785cb43e9519513af
 2021-03-25 12:39:18 +00:00
Lucas Lin
82b3b456cd Merge "Expose some APIs from ConnectivityManager" am: f43adf215e am: de44994554 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653936

Change-Id: I9dac472715fc8f32cb6313f2df8aef872bec9632
 2021-03-25 12:38:47 +00:00
Lucas Lin
cd3a5fa3af Merge "Move FullScore to connectivity mainline module" am: c0e7ab7c3e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653945

Change-Id: I2d5ee266c246e469d2b0296fb6f36f31d4d39d16
 2021-03-25 12:33:48 +00:00
Lucas Lin
d734d34703 Merge "Add annotation for Vpn#getNetwork()" am: 8db8d890a0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653946

Change-Id: I3be5109c253365b3c5bc56ae48114f8e37c4f153
 2021-03-25 12:30:18 +00:00
Lucas Lin
e648a78c15 Merge "Remove the usage of NETID_UNSET from Vpn.java" am: cf1dc9f287 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653929

Change-Id: Ic50dee391e123b9e9debb8e77bac1f0499d939f1
 2021-03-25 12:25:42 +00:00
Chiachang Wang
d41da28087 Merge "Add network disconnected callback" into sc-dev 2021-03-25 12:24:20 +00:00
Lucas Lin
172bc952aa Merge "Remove the usage of hidden API - setIsAvailable() from Vpn" am: 93b20febd4 am: 961a73e0c3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653934

Change-Id: I577c40b2d5dfb4bb6c1d2471a66e47a95ddd1d77
 2021-03-25 12:23:32 +00:00
Lucas Lin
c9dddc84c0 Merge changes Ic2357dcf,Iddf8c71a am: 1ff9b10f74 am: e3d28b9ad0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653939

Change-Id: Icf3acbfb071fc2d24f0d31c719446604567e2281
 2021-03-25 12:23:01 +00:00
lucaslin
e2dfce5a08 Expose NetworkScore to external caller am: 5aea42137f am: f53af56d1a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653938

Change-Id: I807cae8d95e8d5fb1f017b1ba11d800772ba3e9c
 2021-03-25 12:22:59 +00:00
Lucas Lin
b96e8a1c55 Merge changes I6d5dd0a8,I106b3e4f am: 276f8e6a70 am: db4eb02ecd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653932

Change-Id: Ic04621eaa36aa0b2837dced4730d32f415f8dc13
 2021-03-25 12:22:16 +00:00
lucaslin
ab2da1d535 Remove unused import IConnectivityManager am: 6642bda243 am: 307a73be5b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653931

Change-Id: Iea7b4df0ca9d04195e7e38220f2dec11d0a29a8f
 2021-03-25 12:22:14 +00:00
Lucas Lin
b2ae343b9c Merge "Use getAllInterfaceNames to get all interface names" am: c4c056b647 am: ab9c3f219f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653937

Change-Id: I2a51fc361a3ef6fe7a99fe70e8c47fdffa2903bd
 2021-03-25 12:21:20 +00:00
Matt Pietal
9ada0484ad Merge "Keyguard error color" into sc-dev 2021-03-25 12:18:02 +00:00
Lucas Lin
de44994554 Merge "Expose some APIs from ConnectivityManager" am: f43adf215e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653936

Change-Id: I1a31a6162d5098770c0d5b19faa7af83553f6a2e
 2021-03-25 12:17:18 +00:00
Matt Casey
af29800df0 Merge "Add setting for touch gesture and long-press home assistant invocations" into sc-dev 2021-03-25 12:15:09 +00:00
Lucas Lin
961a73e0c3 Merge "Remove the usage of hidden API - setIsAvailable() from Vpn" am: 93b20febd4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653934

Change-Id: Ib83932369dbdf7f04529643cbb91330ea71a4175
 2021-03-25 12:13:04 +00:00
Lucas Lin
e3d28b9ad0 Merge changes Ic2357dcf,Iddf8c71a am: 1ff9b10f74 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653939

Change-Id: I9c5f96893488f1e103cba740a0bbfb474ffe90b9
 2021-03-25 12:07:49 +00:00
lucaslin
f53af56d1a Expose NetworkScore to external caller am: 5aea42137f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653938

Change-Id: I5f2fb6bb6f2de4d81fb3b750053ee5abbe82caeb
 2021-03-25 11:53:29 +00:00
Lucas Lin
db4eb02ecd Merge changes I6d5dd0a8,I106b3e4f am: 276f8e6a70 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653932

Change-Id: Ife29dba8549f9b86cfe757a59fd4c8e61e55738f
 2021-03-25 11:46:03 +00:00
lucaslin
307a73be5b Remove unused import IConnectivityManager am: 6642bda243 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653931

Change-Id: I252a363cf9415b5e956e0427b6fe4dd5a8045930
 2021-03-25 11:43:32 +00:00
Lucas Lin
612a4a78c0 Merge "Add static for constant" into sc-dev 2021-03-25 11:34:09 +00:00
Lucas Lin
ab9c3f219f Merge "Use getAllInterfaceNames to get all interface names" am: c4c056b647 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653937

Change-Id: I42de5ac3508b7947ac3b53717f1133ea6aa8588c
 2021-03-25 11:30:31 +00:00
Lucas Lin
c0e7ab7c3e Merge "Move FullScore to connectivity mainline module" 2021-03-25 11:30:05 +00:00
Lucas Lin
8db8d890a0 Merge "Add annotation for Vpn#getNetwork()" 2021-03-25 11:29:38 +00:00
Lucas Lin
cf1dc9f287 Merge "Remove the usage of NETID_UNSET from Vpn.java" 2021-03-25 11:29:17 +00:00
Lucas Lin
f43adf215e Merge "Expose some APIs from ConnectivityManager" 2021-03-25 11:29:08 +00:00
Lucas Lin
93b20febd4 Merge "Remove the usage of hidden API - setIsAvailable() from Vpn" 2021-03-25 11:29:04 +00:00
Lucas Lin
1ff9b10f74 Merge changes Ic2357dcf,Iddf8c71a 
* changes:
  Expose NetworkAgent constructor taking a NetworkScore parameter
  Expose NetworkScore to external caller
 2021-03-25 11:28:28 +00:00
Sunny Shao
a7540ad2ae Merge "Add a new api "isDefaultBrowser" for new Intent Picker" into sc-dev 2021-03-25 10:58:22 +00:00
Lucas Lin
276f8e6a70 Merge changes I6d5dd0a8,I106b3e4f 
* changes:
  Use public API Network#getNetId() to get netid
  Remove unused import IConnectivityManager
 2021-03-25 10:49:35 +00:00
lucaslin
c3f7c8fd3c Use public API Network#getNetId() to get netid 
Network class will be a part of mainline module, external callers
cannot call its hidden constant. Use public API - getNetId() to
get netid instead.

Bug: 182963397
Test: m
Change-Id: I6d5dd0a8c3879df7bdc1d58e36022045c303bb40
Merged-In: I6d5dd0a8c3879df7bdc1d58e36022045c303bb40
  (cherry-picked from ag/13927649)
 2021-03-25 10:48:55 +00:00
Lucas Lin
c4c056b647 Merge "Use getAllInterfaceNames to get all interface names" 2021-03-25 10:44:51 +00:00
Adrian Roos
c33d71d602 Merge "Fix unexpected IME show because of stale requestedVisibleAwaitingControl" into sc-dev 2021-03-25 10:37:09 +00:00
Anna Zappone
0207f0791c Merge "Merge Missed calls onto tiles by Contact Uri" into sc-dev 2021-03-25 10:32:21 +00:00
lucaslin
6642bda243 Remove unused import IConnectivityManager 
Bug: 182963397
Test: m
Change-Id: I106b3e4f68b4e5610a238931aa3e81afdd927422
Merged-In: I106b3e4f68b4e5610a238931aa3e81afdd927422
  (cherry-picked from ag/13921812)
 2021-03-25 10:22:40 +00:00
lucaslin
fbb3787f53 Add annotation for Vpn#getNetwork() 
- Add @VisibleForTesting & @Nullable for Vpn#getNetwork().
- Remove null check in caller side(test) of Vpn#getNetwork()
because if the code is working properly, it can never be null.

Bug: 182963397
Test: atest FrameworksNetTests
Change-Id: Ic52864003fbebd9f4e95d43fefc2e168437b0122
Merged-In: Ic52864003fbebd9f4e95d43fefc2e168437b0122
  (cherry-picked from ag/13946573)
 2021-03-25 10:21:07 +00:00
lucaslin
737100e979 Remove the usage of NETID_UNSET from Vpn.java 
Modify Vpn#getNetId() to Vpn#getNetwork() and uses NETID_UNSET
when getNetwork() returns null in ConnectivityServiceTest.

Bug: 182963397
Test: atest FrameworksNetTests
Change-Id: I69d449705b1dc541287c72af8dc7705dc4733109
Merged-In: I69d449705b1dc541287c72af8dc7705dc4733109
  (cherry-picked from ag/13927650)
 2021-03-25 10:19:05 +00:00