Commit Graph

566686 Commits

Author SHA1 Message Date
Jooyung Han
274b7bbfbd Make OverlayablePolicy as enum type
It's been used as a container of constants. "enum" suits better.

Fixes: 179836191
Test: m
Change-Id: Icbcda5707c0d2528dcbfad7e5add8d50bc4ec5b9
2021-04-26 13:52:40 +09:00
Chiachang Wang
13e89b75d3 Merge "Address API review feedback" 2021-04-26 00:22:27 +00:00
Lucas Dupin
9ed1dac67c Merge "Color extraction OWNERS" 2021-04-25 01:03:51 +00:00
Lucas Dupin
370279459d Color extraction OWNERS
Bug: 184891403
Test: none
Change-Id: Ieba5767a8c6f465bf8eca28c277aba5b9a6b7f9b
2021-04-24 13:51:21 -07:00
Treehugger Robot
aa21d775a0 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" 2021-04-24 00:41:31 +00:00
Bob Badour
6a66a0714c [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base
Added SPDX-license-identifier-Apache-2.0 to:
  location/tests/Android.bp
  services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
  tests/FlickerTests/test-apps/Android.bp
  tests/backup/Android.mk

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: Ie3a7632b6f46a8a104bfdf52ab77fb7ffefbdd7c
2021-04-23 16:13:27 -07:00
Treehugger Robot
6286d0952d Merge "Add constant values for MPEG-H." 2021-04-23 22:51:55 +00:00
Jack Nudelman
1f9d1566c2 Merge "Call TelephonyProvider apis for backup/restore per-sim settings." 2021-04-23 20:31:47 +00:00
Andy Hung
fae80ba7a4 Merge "MediaFormat: new MIME types for MPEG-H audio" 2021-04-23 20:03:56 +00:00
Andy Hung
e468f6c151 Merge "AudioFormat: Add ENCODING_PCM_32BIT ENCODING_PCM_24BIT_PACKED" 2021-04-23 19:49:33 +00:00
Treehugger Robot
06df6d84eb Merge "Keystore 2.0 SPI: Fix engineDoFinal with null input." 2021-04-23 17:53:34 +00:00
Nicolas Geoffray
0e41945e3a Merge "Drop the O_NOFOLLOW flag." 2021-04-23 11:29:01 +00:00
Anton Hansson
373a27036b Merge "Rename and move stub defaults to modules/common" 2021-04-23 10:38:25 +00:00
Treehugger Robot
b33f9df49c Merge "bpfmt native/android/Android.bp" 2021-04-23 06:48:09 +00:00
Colin Cross
186a6edd47 bpfmt native/android/Android.bp
Fix formatting errors in with bpfmt -w native/android/Android.bp.

Test: builds
Change-Id: I444579e5672b3bc421f7e73f27bb0d12d92a9a03
Merged-In: I444579e5672b3bc421f7e73f27bb0d12d92a9a03
2021-04-23 05:50:40 +00:00
Remi NGUYEN VAN
efcd27a0dc Merge "Use connectivity resources in service-connectivity" 2021-04-23 05:42:13 +00:00
Remi NGUYEN VAN
410973d590 Merge "Add AOSP certificates for connectivity resources" 2021-04-23 05:40:58 +00:00
Chiachang Wang
a424d5bafc Address API review feedback
Address API review feedback to:
 - Rename NetworkAgent#setTeardownDelayMs to
   NetworkAgent#setTeardownDelayMillis
 - Use getters instead of fields in VpnTransportInfo
 - Rename registerDefaultNetworkCallbackAsUid to
   registerDefaultNetworkCallbackForUid in ConnectiivityManager

Bug: 183972850
Bug: 185246410
Fix: 184735863
Test: make update-api
Test: atest FrameworksNetTests
Test: atest CtsNetTestCasesLatestSdk
Change-Id: I5e8c4bed8bda40d507afa894c359b5e24ee5d868
Merged-In: I5e8c4bed8bda40d507afa894c359b5e24ee5d868
2021-04-23 02:46:05 +00:00
Remi NGUYEN VAN
2ecc79d616 Use connectivity resources in service-connectivity
Migrate resource usage to the connectivity resource package.
For framework resources that have known overlays, keep a fallback until
the overlays can be migrated.

Bug: 182125649
Test: atest FrameworksNetTests
Merged-In: I778d94a5aac0c4e20e78b1ba3a002495c17a38a0
(clean cherry-pick)

Change-Id: I778d94a5aac0c4e20e78b1ba3a002495c17a38a0
2021-04-23 10:36:15 +09:00
Xusong Wang
67485cf930 Merge changes from topic "rs-deprecation"
* changes:
  Silence compiler errors because of renderscript deprecation.
  Deprecate RS Java APIs.
2021-04-23 01:16:04 +00:00
Varun Shah
81f00f0198 Merge "Update OWNERS for Content* framework." 2021-04-22 23:59:17 +00:00
Jack Nudelman
fa17e7789c Call TelephonyProvider apis for backup/restore per-sim settings.
Bug: 172244913
Test: make, atest TelephonyProviderTest

Change-Id: I1652172f003e2fd5ab08dfdbf63dadc64e034406
Merged-In: I1652172f003e2fd5ab08dfdbf63dadc64e034406
2021-04-22 23:16:39 +00:00
Tianjie Xu
58deb1cfc1 Merge changes I296c1011,I05695607
* changes:
  Add RecoverySystemServiceTest to presubmit
  Check the return value of RoR preparation/clear
2021-04-22 22:24:46 +00:00
James Lin
86cb5eeb1c Merge "Remove unnecessary UCE APIs because some of UCE APIs change." 2021-04-22 20:25:39 +00:00
Treehugger Robot
07587bd2f7 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 19:44:50 +00:00
Treehugger Robot
f975580f62 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 19:39:00 +00:00
Treehugger Robot
6670c24067 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 19:23:19 +00:00
Treehugger Robot
db44950d25 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 19:22:57 +00:00
Treehugger Robot
679c657122 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 19:16:57 +00:00
Treehugger Robot
7dbd97e972 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 19:16:46 +00:00
Treehugger Robot
4bdc1121da Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 19:13:13 +00:00
Treehugger Robot
59464d6fa9 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:57:46 +00:00
Treehugger Robot
2b348a40ae Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:51:35 +00:00
Treehugger Robot
72c49f5bc3 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:51:06 +00:00
Treehugger Robot
80cca06027 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:48:45 +00:00
Treehugger Robot
ba3a4a3680 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:44:26 +00:00
Treehugger Robot
0033ce1b28 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:39:56 +00:00
Treehugger Robot
1cb2c100e5 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:37:13 +00:00
Treehugger Robot
7852f2af80 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:32:25 +00:00
Treehugger Robot
b5b6d3680a Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:21:21 +00:00
Benedict Wong
9fe8fcdb37 Merge "Add null pointer check for mConfig in onSessionLost" 2021-04-22 18:20:16 +00:00
Treehugger Robot
199b0018ff Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:16:08 +00:00
Treehugger Robot
0774753984 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:12:08 +00:00
Treehugger Robot
4152a1944e Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:08:16 +00:00
Treehugger Robot
9a162a8125 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:06:10 +00:00
Treehugger Robot
898529212a Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:05:19 +00:00
Bill Yi
1021a95849 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iec8f0355ab8f335ba41e01ed64f94fbdd41e1ef5
2021-04-22 10:56:44 -07:00
Bill Yi
6d7588ff90 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I88571b2224d3ce002c0b714c35d8c609f995dc03
2021-04-22 10:25:04 -07:00
Bill Yi
2c8be38df4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2e58733b9d40e871e8f70dfeadc7b877d24a444d
2021-04-22 10:20:17 -07:00
Bill Yi
f7a0b334b9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I24cb0c03387e1985a9afb23483809d28dffa7701
2021-04-22 10:16:38 -07:00