Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
562,863 Commits 3 Branches 0 Tags
7a26ec197642ea02641a2483ef15ef52b7bbb527
Commit Graph

562863 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
7a26ec1976 Merge changes from topic "connectivity_jar_in_apex" am: 60dfb880de am: 6feb97a95b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532910

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id85d632781cd8eb0850e919cd6bf990fca17f414
 2021-01-07 09:49:51 +00:00
Remi NGUYEN VAN
0d28453111 Set setCurrentProxyScriptUrl as public am: 26dbdc853b am: c5939ce4da 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540913

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If93a3c5a9145ac8993f5ee153a87018eed67502b
 2021-01-07 09:49:41 +00:00
Lorenzo Colitti
6feb97a95b Merge changes from topic "connectivity_jar_in_apex" am: 60dfb880de 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532910

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ffdb3af42f1b37647a53f10d3a6e88bee17c335
 2021-01-07 09:29:38 +00:00
Remi NGUYEN VAN
c5939ce4da Set setCurrentProxyScriptUrl as public am: 26dbdc853b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540913

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2936ba4d40e18c507b68f6b3b97605d8a1483adf
 2021-01-07 09:26:30 +00:00
Lorenzo Colitti
60dfb880de Merge changes from topic "connectivity_jar_in_apex" 
* changes:
  Move service-connectivity to the tethering APEX
  Set setCurrentProxyScriptUrl as public
 2021-01-07 08:34:25 +00:00
Chiachang Wang
6e82c52947 Merge "Remove mobile provision design out from connectivity service" am: 518d9d8f27 am: 194b3d1058 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531804

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0dac2bf826c3d28e9d8791c59764b5d30c83b861
 2021-01-07 08:07:12 +00:00
Chiachang Wang
194b3d1058 Merge "Remove mobile provision design out from connectivity service" am: 518d9d8f27 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531804

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4ad2d91e5fdc740f0253b86977f9b63ba6c4b24
 2021-01-07 07:13:04 +00:00
Chiachang Wang
518d9d8f27 Merge "Remove mobile provision design out from connectivity service" 2021-01-07 06:47:26 +00:00
Chiachang Wang
454497b7df Remove mobile provision design out from connectivity service 
In order to support ConnectivityService mainline, module should
not use hidden APIs. The logic to get mobile provision is moved
to telephony surface since it's only used by telephony.
Hence, remove the design out from Connectivity.

Bug: 175177794
Test: atest FrameworksNetTests
Change-Id: Ic3082fc1c4d7ac998f4e4cff1351e6829d500924
 2021-01-07 06:46:40 +00:00
Lucas Lin
aa3bd77f93 Merge "Replace withCleanCallingIdentity with [clear|restore]CallingIdentity" am: c7906266c5 am: 3b6bae1fee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537266

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I50c09f6f06ea624a44353f0a7870bd500a387eca
 2021-01-07 05:25:27 +00:00
Lucas Lin
3b6bae1fee Merge "Replace withCleanCallingIdentity with [clear|restore]CallingIdentity" am: c7906266c5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537266

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1af526cf485a659f96561c7e8e8f56d5eb84e56
 2021-01-07 05:03:47 +00:00
Lucas Lin
c7906266c5 Merge "Replace withCleanCallingIdentity with [clear|restore]CallingIdentity" 2021-01-07 04:32:54 +00:00
Paul Hu
37daa95e95 Merge "Replace INetworkPolicyManager to NetworkPolicyManager" am: 8918df04a5 am: a3d3b58a30 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534908

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7526ca7f7185ba5ee024c4fb79a23c84086ece9
 2021-01-07 03:22:58 +00:00
Remi NGUYEN VAN
dbbf7a3b4e Move service-connectivity to the tethering APEX 
As part of modularization of ConnectivityService and expansion of the
Tethering module scope, move service-connectivity.jar into the tethering
APEX, and load it from there.

Bug: 171540887
Test: m, device boots and connectivity
Change-Id: Id7b6a4664ae73224b9ab219c94f56d603a62ee5a
 2021-01-07 11:52:42 +09:00
Paul Hu
a3d3b58a30 Merge "Replace INetworkPolicyManager to NetworkPolicyManager" am: 8918df04a5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534908

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4faa3d8e8f437ec807c85aaff874852fd7d3cbb
 2021-01-07 02:32:25 +00:00
Paul Hu
8918df04a5 Merge "Replace INetworkPolicyManager to NetworkPolicyManager" 2021-01-07 02:08:58 +00:00
Treehugger Robot
0932dc2c83 Merge "configure owners for shortcut related tests" am: 40e2fb68e6 am: 09c41ee5dd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542104

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b26283bc79a09467047932b76c21cb47627df97
 2021-01-07 02:04:20 +00:00
Henry Fang
439f57ac9d Merge "TvProvider API standardization for ARIB and DVB TvProvider" am: c8af272fb6 am: f2a1790db8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471523

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I266071322bc21ed4cd60ee33ea8b9b76ca2347cb
 2021-01-07 01:55:59 +00:00
Dmitry Dementyev
62a89de15d [automerger skipped] Protect account chooser activities against overlay. am: fedbadf57e am: e1d00ab8b8 -s ours am: be9c053cef -s ours am: 948bd61f09 -s ours am: 065fbe9cae -s ours am: 91b1893603 -s ours am: deb17bda7f -s ours 
am skip reason: Change-Id I1a16808426934f4a8d12410576d769443e4c2a04 with SHA-1 6ff42dd2d2 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01c2b8a5162339034b86713c68da91e5d9b5651e
 2021-01-07 01:55:40 +00:00
Treehugger Robot
09c41ee5dd Merge "configure owners for shortcut related tests" am: 40e2fb68e6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542104

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I92bd11ba193009c65529fc73d4f6499e069f0b51
 2021-01-07 01:53:47 +00:00
Remi NGUYEN VAN
26dbdc853b Set setCurrentProxyScriptUrl as public 
PacManager is part of services.jar, while ProxyManager is in
service-connectivity.jar. setCurrentProxyScriptUrl cannot be
package-private and called across jars.

As part of modularization of service-connectivity.jar, the
PacManager interface will then be formally defined.

Bug: 171540887
Test: Splitting service-connectivity, ProxyManager can reference the
      method
Change-Id: Ie41a5b569a119f305bf647e55a65febbde459352
 2021-01-07 10:47:11 +09:00
Henry Fang
f2a1790db8 Merge "TvProvider API standardization for ARIB and DVB TvProvider" am: c8af272fb6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471523

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I397511ac1d2f548504b5b3f6d12ca65cf69dd64c
 2021-01-07 01:24:18 +00:00
Dmitry Dementyev
deb17bda7f [automerger skipped] Protect account chooser activities against overlay. am: fedbadf57e am: e1d00ab8b8 -s ours am: be9c053cef -s ours am: 948bd61f09 -s ours am: 065fbe9cae -s ours am: 91b1893603 -s ours 
am skip reason: Change-Id I1a16808426934f4a8d12410576d769443e4c2a04 with SHA-1 6ff42dd2d2 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7515c5d471509c53b234d43432ced958e979c84e
 2021-01-07 01:19:45 +00:00
Automerger Merge Worker
1bfde096c3 Merge changes from topic "am-8fe1bfad79f84157a29ab2e38769dd1e" into rvc-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Set mAllowWhileInUsePermissionInFgs correctly when bindService() from background." into rvc-dev am: 970762d46c am: 2005c4ee01 -s ours am: da3fa364ca -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Set mAllowWhileInUsePermissionInFgs correctly when bindService() from background. am: 346eed7325 am: 883e25f011 -s ours am: 6f4aadc779 -s ours
 2021-01-07 01:09:32 +00:00
Hui Yu
d5366eb99c [automerger skipped] Merge "RESTRICT AUTOMERGE: Set mAllowWhileInUsePermissionInFgs correctly when bindService() from background." into rvc-dev am: 970762d46c am: 2005c4ee01 -s ours am: da3fa364ca -s ours 
am skip reason: Change-Id I7a240621267648ea54e7dc737ebc55bc665e39b6 with SHA-1 86bd39db35 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie55644c12f681f01f4b3d69ba2c3df368771a30e
 2021-01-07 01:09:23 +00:00
Connor O'Brien
51271ba04a Merge "Clear BPF data in KernelCpuUidTimeReader.removeUid()" am: d5e143eee7 am: c5a860d297 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520149

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4e7d114ffec9c4fe9c2f5378ce89c80a92590015
 2021-01-07 01:09:20 +00:00
Hui Yu
8eea7f6c2d [automerger skipped] RESTRICT AUTOMERGE: Set mAllowWhileInUsePermissionInFgs correctly when bindService() from background. am: 346eed7325 am: 883e25f011 -s ours am: 6f4aadc779 -s ours 
am skip reason: Change-Id I7a240621267648ea54e7dc737ebc55bc665e39b6 with SHA-1 86bd39db35 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e22279980bf588b2524adaf33bf96caca4c25dc
 2021-01-07 01:09:06 +00:00
Collin Fijalkovich
ac67934dae Merge "Allow Traceur to take START_FOREGROUND_SERVICES_FROM_BACKGROUND" am: c9edda6886 am: 2159e77523 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541332

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I608ab5f1f324c5aff31e552bb5575b1e81a1f240
 2021-01-07 01:09:02 +00:00
Treehugger Robot
40e2fb68e6 Merge "configure owners for shortcut related tests" 2021-01-07 00:50:50 +00:00
Dmitry Dementyev
91b1893603 [automerger skipped] Protect account chooser activities against overlay. am: fedbadf57e am: e1d00ab8b8 -s ours am: be9c053cef -s ours am: 948bd61f09 -s ours am: 065fbe9cae -s ours 
am skip reason: Change-Id I1a16808426934f4a8d12410576d769443e4c2a04 with SHA-1 6ff42dd2d2 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20ba00a11c0524b2452c27b9e31e540417ac7d4b
 2021-01-07 00:41:22 +00:00
Henry Fang
c8af272fb6 Merge "TvProvider API standardization for ARIB and DVB TvProvider" 2021-01-07 00:30:05 +00:00
Hui Yu
da3fa364ca [automerger skipped] Merge "RESTRICT AUTOMERGE: Set mAllowWhileInUsePermissionInFgs correctly when bindService() from background." into rvc-dev am: 970762d46c am: 2005c4ee01 -s ours 
am skip reason: Change-Id I7a240621267648ea54e7dc737ebc55bc665e39b6 with SHA-1 86bd39db35 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c3e570d60cea20eb0bc0700340baa706e14d200
 2021-01-07 00:24:40 +00:00
Hui Yu
6f4aadc779 [automerger skipped] RESTRICT AUTOMERGE: Set mAllowWhileInUsePermissionInFgs correctly when bindService() from background. am: 346eed7325 am: 883e25f011 -s ours 
am skip reason: Change-Id I7a240621267648ea54e7dc737ebc55bc665e39b6 with SHA-1 86bd39db35 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd6b4d5874503ca83c632525e05018437775bafd
 2021-01-07 00:24:32 +00:00
Connor O'Brien
c5a860d297 Merge "Clear BPF data in KernelCpuUidTimeReader.removeUid()" am: d5e143eee7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520149

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7344ca2155ea1f5ccddca31818aae309d5b90715
 2021-01-07 00:23:05 +00:00
Collin Fijalkovich
2159e77523 Merge "Allow Traceur to take START_FOREGROUND_SERVICES_FROM_BACKGROUND" am: c9edda6886 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541332

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67e80a3040747d1c9d687d3430a53e414b2f2d65
 2021-01-07 00:19:32 +00:00
TreeHugger Robot
3bd551ede2 Merge "Protect account chooser activities against overlay." into qt-dev am: 7f2257fa0f am: 683623e8b0 am: be186dc33e am: 88e38a7d1c am: 37ff5c9d04 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13191817

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b0f76a2f9ea938e219a00e46e103c915bd5c739
 2021-01-07 00:18:59 +00:00
Dmitry Dementyev
065fbe9cae [automerger skipped] Protect account chooser activities against overlay. am: fedbadf57e am: e1d00ab8b8 -s ours am: be9c053cef -s ours am: 948bd61f09 -s ours 
am skip reason: Change-Id I1a16808426934f4a8d12410576d769443e4c2a04 with SHA-1 6ff42dd2d2 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8bf63aac89074610dbb8f6b475e3d6ba0f420f67
 2021-01-07 00:18:39 +00:00
Hui Yu
2005c4ee01 Merge "RESTRICT AUTOMERGE: Set mAllowWhileInUsePermissionInFgs correctly when bindService() from background." into rvc-dev am: 970762d46c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13236923

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3bdb01bca9d8e14f2a62f379d4e688a91770c28
 2021-01-06 23:41:33 +00:00
Hui Yu
883e25f011 RESTRICT AUTOMERGE: Set mAllowWhileInUsePermissionInFgs correctly when bindService() from background. am: 346eed7325 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13236923

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d407b76df870c343a30199bf69ff4d0025c67e7
 2021-01-06 23:41:30 +00:00
Treehugger Robot
9ce4ee78f1 Merge "New OWNERS file for a new sub-directory" am: fdbad11434 am: 4ae208f416 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540555

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd122d5f2ef53334fb2df1ce60fb1231ea8ccd6e
 2021-01-06 23:41:15 +00:00
Connor O'Brien
d5e143eee7 Merge "Clear BPF data in KernelCpuUidTimeReader.removeUid()" 2021-01-06 23:38:12 +00:00
Collin Fijalkovich
c9edda6886 Merge "Allow Traceur to take START_FOREGROUND_SERVICES_FROM_BACKGROUND" 2021-01-06 23:35:54 +00:00
TreeHugger Robot
37ff5c9d04 Merge "Protect account chooser activities against overlay." into qt-dev am: 7f2257fa0f am: 683623e8b0 am: be186dc33e am: 88e38a7d1c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13191817

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If31258e284c7bad73295eaffcc2a1011f4538ad6
 2021-01-06 23:34:54 +00:00
Dmitry Dementyev
948bd61f09 [automerger skipped] Protect account chooser activities against overlay. am: fedbadf57e am: e1d00ab8b8 -s ours am: be9c053cef -s ours 
am skip reason: Change-Id I1a16808426934f4a8d12410576d769443e4c2a04 with SHA-1 6ff42dd2d2 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie78c9b638fe0d342b31833ddee9b2a4e790fddc3
 2021-01-06 23:34:12 +00:00
Hui Yu
970762d46c Merge "RESTRICT AUTOMERGE: Set mAllowWhileInUsePermissionInFgs correctly when bindService() from background." into rvc-dev 2021-01-06 23:22:53 +00:00
Treehugger Robot
4ae208f416 Merge "New OWNERS file for a new sub-directory" am: fdbad11434 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540555

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01bde2f84ff92e41b60a60896709d807d8a4e7a0
 2021-01-06 23:18:39 +00:00
Dmitry Dementyev
be9c053cef [automerger skipped] Protect account chooser activities against overlay. am: fedbadf57e am: e1d00ab8b8 -s ours 
am skip reason: Change-Id I1a16808426934f4a8d12410576d769443e4c2a04 with SHA-1 6ff42dd2d2 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I31b47fd1a80db951eaa393a429e5495cc31a31e8
 2021-01-06 23:10:43 +00:00
TreeHugger Robot
88e38a7d1c Merge "Protect account chooser activities against overlay." into qt-dev am: 7f2257fa0f am: 683623e8b0 am: be186dc33e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13191817

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifab96b3897510a77e23ed02b3c0cb8ca57d21b65
 2021-01-06 23:09:49 +00:00
Treehugger Robot
fdbad11434 Merge "New OWNERS file for a new sub-directory" 2021-01-06 22:54:21 +00:00
Dmitry Dementyev
e1d00ab8b8 Protect account chooser activities against overlay. am: fedbadf57e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13194523

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec137ae2642e0a5ac5247e9939c68d65179f02fd
 2021-01-06 22:51:41 +00:00