Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
564,269 Commits 3 Branches 0 Tags
8e84f29c7eae358cc68c77f8d5e5904ef7fac597
Commit Graph

564269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Hansson
8e84f29c7e Merge "Set installable: false on apex jars by default" am: 42fb4206f8 am: a1e0090236 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559505

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80b9f470b6fd2b81e4782199d318b69f427eb325
 2021-01-28 17:00:43 +00:00
Treehugger Robot
bdef0ad3bc Merge "DO NOT MERGE Fix CEC read Global Setting timing" am: 7e69b0a93d am: c0c9dbfc2f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537562

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie3fad210d8cfa0ad6619d0216fd3f8af17184495
 2021-01-28 16:49:43 +00:00
daren.liao
79f19d0314 DO NOT MERGE Fix CEC read Global Setting timing am: 3bbf6c4bc0 am: 0770cd25c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537562

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I424d9adecad265dda86e581f2fc86990fb97b2fb
 2021-01-28 16:49:40 +00:00
Paul Duffin
387f57737c Merge "Add framework boot image" am: 08ff0a8639 am: 45f1fa008c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556302

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I167c76cc3f965e3feefde79f6af95241864d33d7
 2021-01-28 16:48:26 +00:00
Anton Hansson
a1e0090236 Merge "Set installable: false on apex jars by default" am: 42fb4206f8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559505

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b3459ee028cd2e4e5f5fe1f7777418a2dce1888
 2021-01-28 16:48:22 +00:00
Anton Hansson
42fb4206f8 Merge "Set installable: false on apex jars by default" 2021-01-28 16:44:40 +00:00
Treehugger Robot
c0c9dbfc2f Merge "DO NOT MERGE Fix CEC read Global Setting timing" am: 7e69b0a93d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537562

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f85bb0e430969ff28604c436c140ec444e49275
 2021-01-28 16:22:41 +00:00
daren.liao
0770cd25c2 DO NOT MERGE Fix CEC read Global Setting timing am: 3bbf6c4bc0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537562

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I234893830e878c02ff6d5e6b078525daf85dbff8
 2021-01-28 16:12:38 +00:00
Paul Duffin
45f1fa008c Merge "Add framework boot image" am: 08ff0a8639 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556302

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia39190ddae4119a364c62dbe5c1a0becd8d90226
 2021-01-28 16:06:35 +00:00
Treehugger Robot
7e69b0a93d Merge "DO NOT MERGE Fix CEC read Global Setting timing" 2021-01-28 15:44:40 +00:00
Paul Duffin
08ff0a8639 Merge "Add framework boot image" 2021-01-28 15:39:57 +00:00
Treehugger Robot
1d90421899 Merge "Remove obsolete OWNERS files" am: b57fa98f59 am: 394138bd68 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562313

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic0de6038cac1bf5706ea573d58790993e5c75738
 2021-01-28 15:31:53 +00:00
Treehugger Robot
394138bd68 Merge "Remove obsolete OWNERS files" am: b57fa98f59 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562313

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I88b0a43792ff4b1c36950a6f5f35c131c6905d4d
 2021-01-28 15:06:36 +00:00
Paul Duffin
1128114af1 Add framework boot image 
Currently, it is just a placeholder that retrieves information about
the framework boot image from the dex_bootjars singleton.

Bug: 177892522
Test: m droid
Change-Id: Icd7943a37378a56c416e502aa29d6088c2f247d2
Exempt-From-Owner-Approval: https://crbug.com/gerrit/14008
 2021-01-28 14:53:49 +00:00
Treehugger Robot
b57fa98f59 Merge "Remove obsolete OWNERS files" 2021-01-28 14:28:55 +00:00
Treehugger Robot
42cc0967a5 Merge "ECDH SPI interface" am: e43b86d5b1 am: 5e78686425 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542804

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie718a218f85265627c2e8088806bbc950cb2eb9e
 2021-01-28 14:15:14 +00:00
Junyu Lai
8062b53a7c Merge "[VCN01] Add NOT_VCN_MANAGED capability" am: ce07556044 am: 6373b3b084 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549897

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia78c1366c0f843bfeadcb16f857a0fc13e2b72cd
 2021-01-28 14:15:04 +00:00
Treehugger Robot
5e78686425 Merge "ECDH SPI interface" am: e43b86d5b1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542804

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95b8cb39fd5f57c08c43dbdcae1c0828e93f3666
 2021-01-28 13:40:31 +00:00
Junyu Lai
6373b3b084 Merge "[VCN01] Add NOT_VCN_MANAGED capability" am: ce07556044 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549897

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30b0cc54c340150884bebfd289824f1e562eea88
 2021-01-28 13:25:50 +00:00
Treehugger Robot
e43b86d5b1 Merge "ECDH SPI interface" 2021-01-28 13:08:42 +00:00
Junyu Lai
ce07556044 Merge "[VCN01] Add NOT_VCN_MANAGED capability" 2021-01-28 13:04:59 +00:00
daren.liao
3bbf6c4bc0 DO NOT MERGE Fix CEC read Global Setting timing 
[Description]
When UI enables 2 CEC options right after enable CEC
TV will read the wrong value,
and failed to update value before TV is ready.

We should read the setting again after TV is ready.

Bug: 176708541
Test: Toggle HDMI control settings 10 times PASS

Change-Id: I0e8eaefe3839873c4af476d47bdb1295711d5967
 2021-01-28 12:10:16 +00:00
Neil Fuller
ab88c1e30a Remove obsolete OWNERS files 
The code has been moved (internally) under bug 175119330. The code that
was here now can be found in
com.android.server.timezonedetector.location instead.

Bug: 175119330
Test: treehugger only
Change-Id: I0446ea16921886ac826f25d624a1c61551d2313e
 2021-01-28 12:00:51 +00:00
Oliver Woodman
b5d864ee38 Merge "API to get SOC manufacturer and model" am: a6b77e3294 am: 5fe83ca052 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1518117

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I740131a0a906356582e6ab1264ec135bba2a788e
 2021-01-28 10:27:01 +00:00
Oliver Woodman
5fe83ca052 Merge "API to get SOC manufacturer and model" am: a6b77e3294 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1518117

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib77e15b216e4e4c79b93586d5167bba92026aa29
 2021-01-28 10:00:21 +00:00
Oliver Woodman
a6b77e3294 Merge "API to get SOC manufacturer and model" 2021-01-28 09:07:56 +00:00
Treehugger Robot
8172883202 Merge "Note network interfaces based on transport" am: 8334a265ad am: cd65235a77 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562876

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I444343c7230c0f947a666334fb895736fa4bc153
 2021-01-28 09:02:21 +00:00
Treehugger Robot
cd65235a77 Merge "Note network interfaces based on transport" am: 8334a265ad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562876

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae2ae51e3819b37cf2c85ce12715978d6ba68c55
 2021-01-28 08:32:23 +00:00
Treehugger Robot
8334a265ad Merge "Note network interfaces based on transport" 2021-01-28 07:45:20 +00:00
Lorenzo Colitti
2a0bb42e8e Merge "Fix legacy APIs when VPN switches to suspended underlying network." am: 4452f55a2e am: f8bac85e95 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547497

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I174ab03efc5291c58aa2842831ba2cd62381cf43
 2021-01-28 07:42:30 +00:00
Chiachang Wang
9bb7ef7bd2 Merge "Replace hidden getFileDescriptor$()" am: 842319b819 am: 4b2d4e4e3b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553966

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id15d49eb46923d3d5c0433babeceea9fec21386c
 2021-01-28 07:32:11 +00:00
Treehugger Robot
8da61cc1f4 Merge "[Mainline] Migrate TextUtils#emptyIfNull" am: 23438d66dd am: 562a34498f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550514

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie90c6d0245703243f66a9bc2e4d0bf512b3e6339
 2021-01-28 07:31:49 +00:00
Lorenzo Colitti
f8bac85e95 Merge "Fix legacy APIs when VPN switches to suspended underlying network." am: 4452f55a2e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547497

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I385f93ef5fc3a627fcc2ae827c72e0785c464d8f
 2021-01-28 07:22:25 +00:00
Chiachang Wang
4b2d4e4e3b Merge "Replace hidden getFileDescriptor$()" am: 842319b819 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553966

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6f87447485fd0a4ee008bcabea80b4827fdd99b
 2021-01-28 07:15:15 +00:00
Lorenzo Colitti
4452f55a2e Merge "Fix legacy APIs when VPN switches to suspended underlying network." 2021-01-28 07:07:37 +00:00
Treehugger Robot
562a34498f Merge "[Mainline] Migrate TextUtils#emptyIfNull" am: 23438d66dd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550514

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ae1d067d23fb87d97f326f6da29ddf3a022a821
 2021-01-28 07:04:48 +00:00
Chiachang Wang
842319b819 Merge "Replace hidden getFileDescriptor$()" 2021-01-28 06:36:11 +00:00
Remi NGUYEN VAN
2c9ed7f32d Note network interfaces based on transport 
Instead of classifying interfaces by network type in BatteryStats,
classify them based on the transports array provided by the
NetworkAgent.

Network types are deprecated and transports should be used instead. This
change allows BatteryStats to stop depending on unstable APIs such as
isNetworkTypeMobile.

This change also updates nullability annotations in ConnectivityService
and NetworkAgentInfo to show that the NetworkCapabilities are non-null
(as provided by the network agent) when calling
noteNetworkInterfaceTransports.

Bug: 174436414
Test: atest
  atest ConnectivityServiceTest#testBatteryStatsNetworkType \
      --rerun-until-failure 40

Merged-In: I4e928fac8a57a9b1fc758a44af2a5719b8c871b8

Change-Id: I4e928fac8a57a9b1fc758a44af2a5719b8c871b8
 2021-01-28 15:10:54 +09:00
Treehugger Robot
23438d66dd Merge "[Mainline] Migrate TextUtils#emptyIfNull" 2021-01-28 06:05:08 +00:00
Etan Cohen
59b4925437 Merge changes I0eb0362e,Iec9b579d am: 6c0e8ad627 am: 1e9a56a83f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556330

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46be3b5cf0ccdd24545f671f09b5cc90aedca9e3
 2021-01-28 05:57:41 +00:00
Etan Cohen
1e9a56a83f Merge changes I0eb0362e,Iec9b579d am: 6c0e8ad627 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556330

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib155ee03b68d11fb84524cfbd005d9e8a545d777
 2021-01-28 05:19:56 +00:00
Lucas Lin
d19a5eace9 Merge "Use createStringArray instead of readStringArray" am: 66cd788d4e am: 9a1b958e67 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559093

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1631856cb2324f5295f834ce8ff2f6276d15a759
 2021-01-28 05:01:27 +00:00
Lucas Lin
dbc70f90c7 Merge "Check if NetworkSpecifier is an instance of MatchAllNetworkSpecifier" am: ec3f650de7 am: b82753716e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556546

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I061c38c83eedf9235d85c4353e88b72117d93b86
 2021-01-28 05:01:00 +00:00
Etan Cohen
6c0e8ad627 Merge changes I0eb0362e,Iec9b579d 
* changes:
  Grant shell permissions for restart WiFi subsystem to Shell to support CTS
  [WIFI] New permission to control restart of the WiFi subsystem
 2021-01-28 04:47:00 +00:00
Lucas Lin
9a1b958e67 Merge "Use createStringArray instead of readStringArray" am: 66cd788d4e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559093

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38445a56180675c48055fc4256ea238c2b86fabe
 2021-01-28 04:31:18 +00:00
Lucas Lin
b82753716e Merge "Check if NetworkSpecifier is an instance of MatchAllNetworkSpecifier" am: ec3f650de7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556546

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd01df52928e13717eae903c49e201f7bf39940e
 2021-01-28 04:28:10 +00:00
Lucas Lin
66cd788d4e Merge "Use createStringArray instead of readStringArray" 2021-01-28 04:04:10 +00:00
lucaslin
31d270a4d7 Use createStringArray instead of readStringArray 
To prevent ProxyInfo calling hidden API, use public one -
Parcel#createStringArray() instead.

Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: I1a5376872d743e1863982bb95d579aeba7159d33
 2021-01-28 04:03:59 +00:00
Lucas Lin
ec3f650de7 Merge "Check if NetworkSpecifier is an instance of MatchAllNetworkSpecifier" 2021-01-28 04:01:49 +00:00
Chiachang Wang
b219ee2cde Replace hidden getFileDescriptor$() 
It's the preparation for the incoming ConnectivityService
mainline. The mainline modules can not access hidden APIs.
Thus, the hidden APIs usage should be removed.

The getFileDescriptor$() in Socket or DatagramSocket is
hidden for internal usage. It should be used in a module and
not prefer to expose as an API. Thus, replace it with
ParcelFileDescriptor APIs to get the fd via
ParcelFileDescriptor.

Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: I05b31a48315e7e6d95e22123103e544a7136a449
 2021-01-28 11:33:13 +08:00