Commit Graph

567306 Commits

Author SHA1 Message Date
Jagadeesh Pakaravoor
252a7a0f4f Merge "Add madvising of .odex, .vdex and .art files" am: fcf61e805a am: 876927e795
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611231

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I82cd1912c4685793d81c074763267c19b0803879
2021-03-12 20:45:02 +00:00
Jagadeesh Pakaravoor
876927e795 Merge "Add madvising of .odex, .vdex and .art files" am: fcf61e805a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611231

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ca142cfa6bed60d8a0fec2156c689222cdfeb1a
2021-03-12 20:07:53 +00:00
Jagadeesh Pakaravoor
fcf61e805a Merge "Add madvising of .odex, .vdex and .art files" 2021-03-12 19:30:02 +00:00
Hui Wang
4d61aa2d36 Merge "Add onPreProvisioningRecevied to RcsProvisioningCallback" am: f395f2dd4b am: d57ee0764d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629520

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58642b6fa631eff86855bccb7d9d3b0edff1cc43
2021-03-12 18:52:12 +00:00
Hui Wang
6f9a3581cc Merge "Make the doc of bootstrapAuthenticationRequest more accurate" am: 14d654f998 am: d783f90b6d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629521

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7357379ca6fb8e3e824ad8fb659f0cdd8e00fc1e
2021-03-12 18:52:02 +00:00
Andy Hung
efb2d5bdfe Merge "SoundPool: Fix clang-tidy" am: c337968e03 am: fa59a51450
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625766

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f47e7b2a63cdb446854eb09b105f27aef244940
2021-03-12 18:50:08 +00:00
Hui Wang
d57ee0764d Merge "Add onPreProvisioningRecevied to RcsProvisioningCallback" am: f395f2dd4b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629520

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I39569c6bb7bdbdedf7182a7bb732d569761ff0e6
2021-03-12 18:42:55 +00:00
Hui Wang
d783f90b6d Merge "Make the doc of bootstrapAuthenticationRequest more accurate" am: 14d654f998
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629521

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f906612bfe94da792139601dd7ce9d2280f4d67
2021-03-12 18:32:33 +00:00
Hui Wang
f395f2dd4b Merge "Add onPreProvisioningRecevied to RcsProvisioningCallback" 2021-03-12 18:22:52 +00:00
Hui Wang
14d654f998 Merge "Make the doc of bootstrapAuthenticationRequest more accurate" 2021-03-12 18:17:43 +00:00
Andy Hung
fa59a51450 Merge "SoundPool: Fix clang-tidy" am: c337968e03
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625766

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5acdc2ebaa54865f48589fb3cfc41e77a7b76dc1
2021-03-12 18:14:28 +00:00
Hasini Gunasinghe
216234ab45 Merge "Keystore2: Integrate getState method of IKeystoreMaintenance AIDL." am: 11e324829e am: 181ffb4bec
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1630059

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c8daf4d127925d993cda0d8eead5ff932fb9320
2021-03-12 17:52:38 +00:00
Andy Hung
c337968e03 Merge "SoundPool: Fix clang-tidy" 2021-03-12 17:39:42 +00:00
Hasini Gunasinghe
181ffb4bec Merge "Keystore2: Integrate getState method of IKeystoreMaintenance AIDL." am: 11e324829e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1630059

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9e2b82448ca1c0deb1339acee034933039cd711
2021-03-12 17:16:30 +00:00
Hasini Gunasinghe
11e324829e Merge "Keystore2: Integrate getState method of IKeystoreMaintenance AIDL." 2021-03-12 16:30:58 +00:00
Andrei-Valentin Onea
3fb101a052 Merge changes Idd7d86f9,I73569744 am: 420476e0cd am: 086acc1ba8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532338

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idec178eb39c014c9817db666fd3d5b5a39be52ba
2021-03-12 14:38:40 +00:00
tomnatan
6f83ff6463 Add support for loading a static overrides file located in /product. am: ed60ceba22 am: b470b0d67e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614848

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4d81116d58c4821b157d9c97fd5ec59af26fc03
2021-03-12 14:38:30 +00:00
Andrei-Valentin Onea
086acc1ba8 Merge changes Idd7d86f9,I73569744 am: 420476e0cd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532338

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a5605574dd5126717f879b2dd367861cc35c215
2021-03-12 14:05:58 +00:00
tomnatan
b470b0d67e Add support for loading a static overrides file located in /product. am: ed60ceba22
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614848

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3194eee0ac82c6bb3b579ce297437d48cfcc854e
2021-03-12 14:03:45 +00:00
Andrei-Valentin Onea
420476e0cd Merge changes Idd7d86f9,I73569744
* changes:
  Do not enable changes newer than the current sdk
  Add support for loading a static overrides file located in /product.
2021-03-12 13:28:50 +00:00
Nicolas Geoffray
55eafcc5a7 Merge "Remove some methods from DdmVmInternal." am: af174a5708 am: 5f117b3491
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549965

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64114ba66d21d40bc9e362b4530f97f05b212c9a
2021-03-12 13:22:03 +00:00
Nicolas Geoffray
5f117b3491 Merge "Remove some methods from DdmVmInternal." am: af174a5708
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549965

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I311a25be21589b452094c1929ad9b695d1eb419f
2021-03-12 12:45:27 +00:00
Nicolas Geoffray
af174a5708 Merge "Remove some methods from DdmVmInternal." 2021-03-12 12:05:45 +00:00
Dorin Drimus
68fb171ec4 Merge "Improve some External Storage Notification texts on TVs" am: 894c63654d am: ce25438e38
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1621095

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf55428bd50e83ede57d0535bae788001bbf4626
2021-03-12 11:17:06 +00:00
Dorin Drimus
ce25438e38 Merge "Improve some External Storage Notification texts on TVs" am: 894c63654d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1621095

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46b14ea01ba656b112f0790c8b0ff758a4049585
2021-03-12 10:39:19 +00:00
Remi NGUYEN VAN
afcdfff9c6 Merge "Remove usage of hidden InetSocketAddress constructor" am: 71ef86e01a am: d340bc1251
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625901

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If44709876c213ef752b1dc94ea64f5b4690ff42f
2021-03-12 10:00:57 +00:00
Treehugger Robot
b618bb7728 Merge "Remove hidden @NetworkType in NetworkInfo" am: a247ffeaad am: 09702cc405
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628359

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I888dc544595c7b5b085ea70e609cacdd6c526591
2021-03-12 10:00:39 +00:00
Treehugger Robot
2e5256b1a2 Merge "Remove hidden INVALID_RESOURCE_ID in unused param" am: 3e432de2a8 am: 88b6a46685
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628299

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I24c665e10814ddf46005fa84ea12cbd4e4e22369
2021-03-12 10:00:28 +00:00
Treehugger Robot
bb09bdec94 Merge "Use ParcelDescriptor.fromSocket instead of getFileDescriptor" am: 7b327e1bef am: 098ac69976
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625439

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I890d00fa46d9623bc7d391379ac9b77b7f33703d
2021-03-12 10:00:17 +00:00
Dorin Drimus
894c63654d Merge "Improve some External Storage Notification texts on TVs" 2021-03-12 09:58:40 +00:00
Remi NGUYEN VAN
d340bc1251 Merge "Remove usage of hidden InetSocketAddress constructor" am: 71ef86e01a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625901

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e2bc5128658973dc873aa3f6eb41593d8d9a308
2021-03-12 09:30:30 +00:00
Treehugger Robot
09702cc405 Merge "Remove hidden @NetworkType in NetworkInfo" am: a247ffeaad
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628359

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8cdd5f7eec86f8bc882f70dbc7480a0c0669358
2021-03-12 09:27:20 +00:00
Treehugger Robot
88b6a46685 Merge "Remove hidden INVALID_RESOURCE_ID in unused param" am: 3e432de2a8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628299

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida08886109393bc8255de1eec64d5f0a45970eba
2021-03-12 09:24:09 +00:00
Treehugger Robot
098ac69976 Merge "Use ParcelDescriptor.fromSocket instead of getFileDescriptor" am: 7b327e1bef
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625439

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b3e8b098eb80098198b1e1cf6c2ce2fe138bc0a
2021-03-12 09:22:33 +00:00
Remi NGUYEN VAN
71ef86e01a Merge "Remove usage of hidden InetSocketAddress constructor" 2021-03-12 09:02:15 +00:00
Treehugger Robot
a247ffeaad Merge "Remove hidden @NetworkType in NetworkInfo" 2021-03-12 08:59:35 +00:00
Treehugger Robot
3e432de2a8 Merge "Remove hidden INVALID_RESOURCE_ID in unused param" 2021-03-12 08:57:55 +00:00
Treehugger Robot
7b327e1bef Merge "Use ParcelDescriptor.fromSocket instead of getFileDescriptor" 2021-03-12 08:57:47 +00:00
Treehugger Robot
4eb4aa3a8a Merge "Refactor DynamicSystemInstallationService notifications" am: fe4b43da67 am: d41966bca6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541269

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8af17c22e1f95fea6fc8bd8fea5866d24b6f0648
2021-03-12 08:25:44 +00:00
Paul Hu
699725db4b Merge "Expose Intent#ACTION_CLEAR_DNS_CACHE" am: 240fdc5d97 am: 844a524110
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625867

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id1529bba9922c7482c3e56509780d13bf9c817d1
2021-03-12 08:25:27 +00:00
Junyu Lai
f263dba043 Merge changes from topics "vcn04", "vcn12" am: 36b03734ef am: caa3ffacfe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628400

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae13465b19d5245782cded0d01ff1b39617c8ac8
2021-03-12 08:24:46 +00:00
Treehugger Robot
d41966bca6 Merge "Refactor DynamicSystemInstallationService notifications" am: fe4b43da67
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541269

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2feba62081661bba530051cf14342660bbed8b77
2021-03-12 08:01:32 +00:00
Paul Hu
844a524110 Merge "Expose Intent#ACTION_CLEAR_DNS_CACHE" am: 240fdc5d97
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625867

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I068cb524cecb9ea5a7bb712902859f244928ee2c
2021-03-12 07:58:45 +00:00
Junyu Lai
caa3ffacfe Merge changes from topics "vcn04", "vcn12" am: 36b03734ef
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628400

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If14f8b2c89483095f22a2b1bc77b0d76cdcb8366
2021-03-12 07:50:50 +00:00
Treehugger Robot
fe4b43da67 Merge "Refactor DynamicSystemInstallationService notifications" 2021-03-12 07:48:51 +00:00
Paul Hu
240fdc5d97 Merge "Expose Intent#ACTION_CLEAR_DNS_CACHE" 2021-03-12 07:47:10 +00:00
Junyu Lai
36b03734ef Merge changes from topics "vcn04", "vcn12"
* changes:
  [VCN12] Expose setSubIds/getSubIds APIs
  [VCN04] Add Subscription Id set into NetworkCapabilities
2021-03-12 07:12:59 +00:00
Roshan Pius
0659f32f4d Merge "ConnectivityManager: Provide API's to include location sensitive info" am: a982725793 am: 890fdb016e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595396

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I47515a4c38e96f6e1caa8ceb50e6b83de8c3ec35
2021-03-12 06:30:45 +00:00
Paul Hu
c065b05794 Merge "Stop using PackageManagerInternal in PermissionMonitor" am: 4f0e7df6e3 am: 3bd9d6993b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620879

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3cc5b5a8d6ae737f75f9c1cf17f7113bed663613
2021-03-12 06:30:34 +00:00
Roshan Pius
890fdb016e Merge "ConnectivityManager: Provide API's to include location sensitive info" am: a982725793
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595396

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf358f0532023ab990dea0ad958eacaa441e107c
2021-03-12 05:58:11 +00:00