Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
570,195 Commits 3 Branches 0 Tags
2028343503da83876907ff877448bb1bf0236c97
Commit Graph

570195 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jooyung Han
2028343503 Merge "Make OverlayablePolicy as enum type" am: 8e87bfb4fb am: 7e9f9ed9f9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686174

Change-Id: I0127ff53eec8c1e8d9847574a097160fc3e84be6
 2021-04-27 03:14:42 +00:00
Jooyung Han
7e9f9ed9f9 Merge "Make OverlayablePolicy as enum type" am: 8e87bfb4fb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686174

Change-Id: I6d9b4b2d61624517784216832d74bfd4248981e8
 2021-04-27 02:41:13 +00:00
Colin Cross
5bc3c6ad47 Merge "Replace llndk_library with llndk clause in cc_library" am: 9e9d7bd0bc am: f9abc183b4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684529

Change-Id: If38a191712cbe55d5bbfe6b96426205270feab1d
 2021-04-27 01:36:30 +00:00
Jooyung Han
8e87bfb4fb Merge "Make OverlayablePolicy as enum type" 2021-04-27 01:23:56 +00:00
Colin Cross
f9abc183b4 Merge "Replace llndk_library with llndk clause in cc_library" am: 9e9d7bd0bc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684529

Change-Id: I1bf4dd9eaf3cb8958b18ddb52e0e667ac625a283
 2021-04-27 01:02:37 +00:00
Colin Cross
9e9d7bd0bc Merge "Replace llndk_library with llndk clause in cc_library" 2021-04-27 00:32:44 +00:00
Treehugger Robot
11dd83b88e Merge "Fix NullPointer Exception in testharness command" am: 881c4ad3e2 am: 079af6fd19 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674567

Change-Id: I2d3bc56809eb5e4f3e7e2cf8916fb40d4cbf78ff
 2021-04-26 23:35:33 +00:00
Treehugger Robot
079af6fd19 Merge "Fix NullPointer Exception in testharness command" am: 881c4ad3e2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674567

Change-Id: I88cbc7392fcdfc8dcdac005ae636d3ada57c28c5
 2021-04-26 23:11:10 +00:00
Joy Babafemi
797448660d Merge "UWB: Add getAdapterState System API" am: f9169bbb09 am: ab258666f3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1685209

Change-Id: I9ee831e08fa9391867cb2e501624cb3c328cff38
 2021-04-26 22:47:08 +00:00
Treehugger Robot
881c4ad3e2 Merge "Fix NullPointer Exception in testharness command" 2021-04-26 22:46:57 +00:00
Treehugger Robot
b3527b07f1 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: e7a1ee828d am: 2c363d2dd9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686987

Change-Id: Ic1476fb8459e57ef85121555f5d472be439bebbc
 2021-04-26 22:39:29 +00:00
Joy Babafemi
ab258666f3 Merge "UWB: Add getAdapterState System API" am: f9169bbb09 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1685209

Change-Id: I7b9024ece370bcab9b48de188d538168867653a2
 2021-04-26 22:27:29 +00:00
Treehugger Robot
2c363d2dd9 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: e7a1ee828d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686987

Change-Id: Ia847f44823612fdf31c930eeb8cd5ca7c33ddd35
 2021-04-26 22:10:31 +00:00
Joy Babafemi
f9169bbb09 Merge "UWB: Add getAdapterState System API" 2021-04-26 21:52:46 +00:00
Treehugger Robot
e7a1ee828d Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" 2021-04-26 21:13:57 +00:00
Bob Badour
6b3ffd27ab [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/DynamicCodeLoggerIntegrationTests/Android.mk
  tests/FlickerTests/test-apps/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: If81cb09cb5da063fe7cc00a70d46ce6d4ce5b10e
 2021-04-26 12:42:45 -07:00
Kevin Chyn
9cbf1ef9ef Merge "Update biometric OWNERs to single source of truth" am: 8d75fd0d02 am: d72f38390a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1685327

Change-Id: Iceff96b2c4d993e1287528de9b122c4b9361904f
 2021-04-26 19:23:18 +00:00
Kevin Chyn
d72f38390a Merge "Update biometric OWNERs to single source of truth" am: 8d75fd0d02 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1685327

Change-Id: I80ba7518569519efcb51d74906f4e71ae52799a7
 2021-04-26 19:03:11 +00:00
Kevin Chyn
8d75fd0d02 Merge "Update biometric OWNERs to single source of truth" 2021-04-26 18:22:02 +00:00
Jack Nudelman
97882604f2 Merge "Don't backup/restore sim-settings if Telephony not present." am: d50bb50f91 am: 68e5bb5582 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1685772

Change-Id: Iae0db0a4457c035ca9d2a2d56190fa49a28e8c92
 2021-04-26 17:12:51 +00:00
Jack Nudelman
68e5bb5582 Merge "Don't backup/restore sim-settings if Telephony not present." am: d50bb50f91 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1685772

Change-Id: I6f3b3874e1e4e0d0b48af77675b27192b91f023d
 2021-04-26 16:53:09 +00:00
Neil Fuller
665d7c76bb Merge "Add OWNERS for android/providers" am: 30a6e0a4ae am: a8067dd770 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684188

Change-Id: I0f51602b2ca6115aec8402f1d76bb22377f28859
 2021-04-26 16:36:52 +00:00
Jack Nudelman
d50bb50f91 Merge "Don't backup/restore sim-settings if Telephony not present." 2021-04-26 16:23:57 +00:00
Neil Fuller
a8067dd770 Merge "Add OWNERS for android/providers" am: 30a6e0a4ae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684188

Change-Id: I7bc23561609dfddc24377bb4a0a5797abb8a445d
 2021-04-26 15:59:26 +00:00
James Mattis
b146660993 Merge "Changing per-app default request to TRACK_DEFAULT" am: bc4ca04caa am: 7bdd8f85d8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682063

Change-Id: I16f4bc417880aeef53a17cb1830666b5fefe5889
 2021-04-26 15:42:37 +00:00
Neil Fuller
30a6e0a4ae Merge "Add OWNERS for android/providers" 2021-04-26 15:18:37 +00:00
James Mattis
7bdd8f85d8 Merge "Changing per-app default request to TRACK_DEFAULT" am: bc4ca04caa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682063

Change-Id: I9632d12c85cc7d0c7d3c80333fdfba7ff024bff2
 2021-04-26 15:07:48 +00:00
James Mattis
bc4ca04caa Merge "Changing per-app default request to TRACK_DEFAULT" 2021-04-26 14:39:44 +00:00
Mathew Inwood
8a46fb77b2 Merge "Revert^2 "API changes as requested by API council."" am: 0bd58c09b2 am: 67084eda34 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684202

Change-Id: Ide1a12e8e7507383b4c233ff88a1a63590f0210e
 2021-04-26 08:55:23 +00:00
Mathew Inwood
67084eda34 Merge "Revert^2 "API changes as requested by API council."" am: 0bd58c09b2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684202

Change-Id: Ife6df3a74ced06c37b5b641beb768dd5bce2d67c
 2021-04-26 08:30:52 +00:00
Mathew Inwood
0bd58c09b2 Merge "Revert^2 "API changes as requested by API council."" 2021-04-26 08:19:47 +00:00
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
786bf2e9bc Merge "Address API review feedback" am: 13e89b75d3 am: 9d2158a9bf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679763

Change-Id: I39de2c7701114faa0bf699a2fdb725a57188886a
 2021-04-26 01:15:12 +00:00
Chiachang Wang
9d2158a9bf Merge "Address API review feedback" am: 13e89b75d3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679763

Change-Id: I7a454e891edf3177bd87f041473f2749d3ee309f
 2021-04-26 00:43:15 +00:00
Chiachang Wang
13e89b75d3 Merge "Address API review feedback" 2021-04-26 00:22:27 +00:00
Joy Babafemi
adf4270f69 UWB: Add getAdapterState System API 
Test: Updated tests for AdapterStateListener.java
Bug: 183254940

Merged-In: I9a7472be2c7cf835cda8910261ba641bf2345b27
Change-Id: I9a7472be2c7cf835cda8910261ba641bf2345b27
 2021-04-25 06:49:42 +00:00
Lucas Dupin
f9215ba0ef Merge "Color extraction OWNERS" am: 9ed1dac67c am: 4111abc621 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1685208

Change-Id: I4a1b6666bbb1abd91641b256c3b5a2ddd119ca04
 2021-04-25 02:00:36 +00:00
Lucas Dupin
4111abc621 Merge "Color extraction OWNERS" am: 9ed1dac67c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1685208

Change-Id: Ica86b86aaf3e7dc0d2a480e27894753b7abb3686
 2021-04-25 01:29:52 +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
1cacb3d497 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: aa21d775a0 am: 58a6b364fa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1685885

Change-Id: I0e359750dbf0971e41cb607bc40b8c4cc8c9ab5e
 2021-04-24 01:35:21 +00:00
Treehugger Robot
58a6b364fa Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: aa21d775a0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1685885

Change-Id: Iefd25d339b9e54c392229fc49e43cdaefe5e37ab
 2021-04-24 01:04:53 +00:00
Treehugger Robot
aa21d775a0 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" 2021-04-24 00:41:31 +00:00
Treehugger Robot
26b0f32060 Merge "Add constant values for MPEG-H." am: 6286d0952d am: 315d8a0faf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670526

Change-Id: I065363f18a7fc389add1518213596bd930d562df
 2021-04-23 23:47:59 +00:00
Treehugger Robot
315d8a0faf Merge "Add constant values for MPEG-H." am: 6286d0952d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670526

Change-Id: I33d29921b8906609c508b0ca37f7c6f4ef48c486
 2021-04-23 23:16:16 +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
025822e42e Merge "Call TelephonyProvider apis for backup/restore per-sim settings." am: 1f9d1566c2 am: bbe5473dff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684527

Change-Id: Iaa41cfc9937ef1950e71dce30e13845b9ea4c61a
 2021-04-23 21:12:53 +00:00
Jack Nudelman
bbe5473dff Merge "Call TelephonyProvider apis for backup/restore per-sim settings." am: 1f9d1566c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684527

Change-Id: I6d7ee0a1e1eb34e031bb19199787f429a6c521f0
 2021-04-23 20:43:48 +00:00
Andy Hung
6698967429 Merge "MediaFormat: new MIME types for MPEG-H audio" am: fae80ba7a4 am: 3eb382c3da 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682765

Change-Id: I2cbfa51d8b0b4c1aaa5452064df6119b0cf8794a
 2021-04-23 20:43:38 +00:00