Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
557,201 Commits 3 Branches 0 Tags
28362be3fb24baba82c9cea98ebc5f908d52ab91
Commit Graph

7238 Commits

Author SHA1 Message Date
Automerger Merge Worker
6c2c137f88 Merge "Merge "Add policies and enforce overlayable to header" into rvc-dev am: 2201f8b626 am: 64d0e6f31b am: e2426c48bd" into rvc-qpr-dev-plus-aosp am: 1da88a7cf1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11481145

Change-Id: I1af37d280e52ea663678d4bf62f2818bfa4f13dc
 2020-06-05 18:46:51 +00:00
Ryan Mitchell
22cf8d565e Merge "Add policies and enforce overlayable to header" into rvc-dev am: 2201f8b626 am: 64d0e6f31b am: e2426c48bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11481145

Change-Id: I268738c0312b6a158599d9487f09b753c91ba36a
 2020-06-05 16:46:45 +00:00
Ryan Mitchell
a707013b78 Add policies and enforce overlayable to header 
If the fulfilled policies change without the contents of the target
and overlay APKs changing, the idmap for the overlay should be
regenerated. This change adds fulfilled policies and enforce
overlayable to the idmap header so that idmap2d can determine if the
polices or enforce overlayable changed from what was used to generate
the idmap.

Bug: 119328308
Test: idmap2_tests
Test: atest RegenerateIdmapTest

Change-Id: I96f970e82b5243be01b205ac2cb6ab249c6100bc
 2020-06-01 16:15:35 -07:00
satayev
b84befad12 Merge "Add support for greylist-max-r signatures." am: dbf501e0eb am: 06a93cbca2 am: dc3191e9bd am: 6e97b389d5 am: 500aaca137 
Change-Id: Ic9406931c472503bd0c48a0e36ba9ad998385e01
 2020-05-21 15:07:58 +00:00
satayev
dc3191e9bd Merge "Add support for greylist-max-r signatures." am: dbf501e0eb am: 06a93cbca2 
Change-Id: Icd1c8858eba2eace7d7bfeccc6fb5dff80e8b6d6
 2020-05-21 14:28:45 +00:00
Artur Satayev
54c2d606b3 Add support for greylist-max-r signatures. 
Bug: 156307884
Test: m
Change-Id: I66f8e48817d16bad5b306b91323bf0cdf42dbabe
 2020-05-20 17:50:24 +01:00
Ryan Mitchell
9ed5638125 Do not rename R.java package 
When the --rename-resources-package flag is used, only rename the
package name within the resources.arsc. Generate the R.java under
the package name defined by the manifest unless --custom-package is
used.

(This is a cherry pick.)

Bug: 147434671
Test: manual
Merged-In: Id9d10e16f32533da1b67ab72ac846791526e7a76
Change-Id: Id9d10e16f32533da1b67ab72ac846791526e7a76
 2020-05-13 09:04:14 -07:00
TreeHugger Robot
51822d01df Merge "Add OWNERS for display, haptics, input and power" into rvc-dev am: f30c225fcb am: 1e3fe956cf am: 689486059f am: 4623e80530 
Change-Id: I80f338fc23ef80f544bc33d169f262346ab17786
 2020-05-12 22:31:13 +00:00
TreeHugger Robot
689486059f Merge "Add OWNERS for display, haptics, input and power" into rvc-dev am: f30c225fcb am: 1e3fe956cf 
Change-Id: I36ce5198582b6aa3fe6fc1c89e9438454df09f3f
 2020-05-12 20:44:35 +00:00
TreeHugger Robot
4dca85b87f Merge "Add OWNERS for display, haptics, input and power" into rvc-dev am: f30c225fcb 
Change-Id: Id6ab3fe424d9914f1ec54c0f9a4684578ed89c0b
 2020-05-12 20:28:17 +00:00
Michael Wright
2e7e81c950 Add OWNERS for display, haptics, input and power 
Bug: 156349083
Test: N/A
Change-Id: Ia8afccfc2e470095ae3d52c827c0ac78b7c120ae
 2020-05-12 19:11:13 +01:00
Ryan Mitchell
d7465318e6 Merge "Do not rename R.java package" into rvc-dev am: 5c8dd641ba am: 98b076b85d am: 1da72bfb6c am: 9bb6fa9e89 
Change-Id: I128110df8aa4c7f0d9abd144be3f4078e6d87ad6
 2020-05-08 18:41:04 +00:00
Ryan Mitchell
98b076b85d Merge "Do not rename R.java package" into rvc-dev am: 5c8dd641ba 
Change-Id: I4a15555cf1df7c81a4d4eea2c77ec0d71df5c44f
 2020-05-08 17:46:11 +00:00
Ryan Mitchell
5c8dd641ba Merge "Do not rename R.java package" into rvc-dev 2020-05-08 17:37:46 +00:00
Ruchir Rastogi
685c684ed3 Merge "Use proper platform version checks (apigen)" into rvc-dev am: 0bb978de88 am: 79e5389451 am: 02a91e9b9b am: c92a51e94c 
Change-Id: I273e6e65999306c86a00f697b147b9359e7d5ce0
 2020-05-08 16:48:14 +00:00
Ruchir Rastogi
79e5389451 Merge "Use proper platform version checks (apigen)" into rvc-dev am: 0bb978de88 
Change-Id: I43bc52a7deeb8889cdd9c5e5b560a261215d0244
 2020-05-08 16:03:26 +00:00
Ryan Mitchell
940ae50498 Add --rename-resources-package to aapt2 
There is currently no way to change the package name encoded in the
resources table. This change adds a flag that controls rewriting the
package name encoded into the resources table. This flag does not
rewrite the package name in the manifest xml.

(This is a cherry pick.)

Bug: 147434671
Test: manual
Merged-In: I435ba07e29df0522c3a44cc5f2c460004a02d71c
Change-Id: I435ba07e29df0522c3a44cc5f2c460004a02d71c
 2020-05-07 17:03:12 -07:00
Ruchir Rastogi
c480dd54ba Use proper platform version checks (apigen) 
Test: m statslog-docsui-java-gen
Bug: 146235828
Change-Id: I5b1a2e0fa356368b91548bd050ec2c493b72f37c
 2020-05-07 12:32:54 -07:00
Ryan Mitchell
2b7e847ac9 Do not rename R.java package 
When the --rename-resources-package flag is used, only rename the
package name within the resources.arsc. Generate the R.java under
the package name defined by the manifest unless --custom-package is
used.

Bug: 147434671
Test: manual
Change-Id: Id9d10e16f32533da1b67ab72ac846791526e7a76
 2020-05-06 11:26:48 -07:00
Svet Ganov
38cd221d81 Updating platform SDK version for R 
* Finalize resources
  * Update appt/aapt2 constants
  * Update R and SDK constants
  * Fix a crashloop bug

Test: build + boot

bug:150281259

Change-Id: Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d
Merged-In: Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d
 2020-05-03 09:58:54 -07:00
Svet Ganov
87ccbfaa46 Updating platform SDK version for R 
* Finalize resources
  * Update appt/aapt2 constants
  * Update R and SDK constants
  * Fix a crashloop bug

Test: build + boot

bug:150281259

Exempt-From-Owner-Approval: merge conflict resolution

Change-Id: Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d
Merged-In: Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d
 2020-05-02 14:26:57 -07:00
Svet Ganov
ed460aa186 Updating platform SDK version for R 
* Finalize resources
  * Update appt/aapt2 constants
  * Update R and SDK constants
  * Fix a crashloop bug

Test: build + boot

bug:150281259

Change-Id: Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d
 2020-05-01 15:25:27 -07:00
Ryan Mitchell
1e43cc068b Merge "Treat non-integer target SDK as version 10000" into rvc-dev am: 7adb6a1c58 am: 6792a33c0c am: 5ccbe1ef42 am: 0860bd59f3 
Change-Id: I0c4bec68c9615b9e9516c4c432ebd24a2a6cea9e
 2020-04-30 21:33:08 +00:00
Ryan Mitchell
5ccbe1ef42 Merge "Treat non-integer target SDK as version 10000" into rvc-dev am: 7adb6a1c58 am: 6792a33c0c 
Change-Id: I3b4c79c0efaf68207157b6f6a8d095efb178feb1
 2020-04-30 20:48:41 +00:00
Ryan Mitchell
0e360fad3b Merge "Treat non-integer target SDK as version 10000" into rvc-dev am: 7adb6a1c58 
Change-Id: I67f066baf0b850817fda00c68a21ace85f6bfb3d
 2020-04-30 20:29:11 +00:00
Ryan Mitchell
7adb6a1c58 Merge "Treat non-integer target SDK as version 10000" into rvc-dev 2020-04-30 20:19:49 +00:00
Ryan Mitchell
95f024289b Treat non-integer target SDK as version 10000 
Currently aapt2 treats non-integer target SDK values as SDK level 0.
This resulted in incorrect implied permission dumps. This change
causes aapt2 to treat non-integer SDK values as version 10000.

Bug: 155391001
Test: aapt2 dump badging CtsSkQPTestCases.apk
Change-Id: Ie4312a827974a7a10b40b12f8f23d264d1b1999a
 2020-04-30 10:31:14 -07:00
Treehugger Robot
26105c646b Merge "Fix clang-analyzer-core.uninitialized.Branch warnings" am: 54ac3c6932 am: 996530f7c1 am: 9109c6303d am: 862c45d77e am: cb943c91c0 
Change-Id: I70d48b2d5c3c8aa8578995ff581c2eac13363136
 2020-04-28 02:53:19 +00:00
Treehugger Robot
9109c6303d Merge "Fix clang-analyzer-core.uninitialized.Branch warnings" am: 54ac3c6932 am: 996530f7c1 
Change-Id: Ic0e0fe3c131c1f9960251204db36a42d2e92035e
 2020-04-28 02:08:33 +00:00
Treehugger Robot
54ac3c6932 Merge "Fix clang-analyzer-core.uninitialized.Branch warnings" 2020-04-28 01:36:36 +00:00
Roshan Pius
29c974a624 aapt2: Add command to rename overlay "targetPackage" attribute 
Bug: 154960712
Test: atest ManifestFixerTest
Change-Id: I556fc11e271337de40c70d4ed56a0381a2f79712
Merged-In: I556fc11e271337de40c70d4ed56a0381a2f79712
 2020-04-28 00:30:04 +00:00
Automerger Merge Worker
fafe29f8b2 Merge "Merge "aapt2: Add command to rename overlay "targetPackage" attribute" into rvc-dev am: 6839fc74b6 am: 5c47bceb5d" into rvc-d1-dev-plus-aosp am: 88786a6f61 am: b1b587c7fb 
Change-Id: If200647b976a4d562f7bc2fcc0cc3b2b97c0d485
 2020-04-27 23:14:46 +00:00
TreeHugger Robot
7e1ac80637 Merge "aapt2: Add command to rename overlay "targetPackage" attribute" into rvc-dev am: 6839fc74b6 am: 5c47bceb5d 
Change-Id: Ie1752a33f28ff1cfa7f453b90815c552b9b14a39
 2020-04-27 23:08:42 +00:00
TreeHugger Robot
136b08c06f Merge "aapt2: Add command to rename overlay "targetPackage" attribute" into rvc-dev am: 6839fc74b6 
Change-Id: I3aa0d0ec7107cb20f026e03fc0bf3ad3805c0cba
 2020-04-27 22:55:31 +00:00
Roshan Pius
ae12ce4119 aapt2: Add command to rename overlay "targetPackage" attribute 
Bug: 154960712
Test: atest ManifestFixerTest
Change-Id: I556fc11e271337de40c70d4ed56a0381a2f79712
 2020-04-27 21:49:23 +00:00
Chih-Hung Hsieh
7887035743 Fix clang-analyzer-core.uninitialized.Branch warnings 
Bug: 154760495
Test: make with WITH_TIDY=1 and DEFAULT_GLOBAL_TIDY_CHECKS=clang-analyzer-core.uninitialized.Branch
Change-Id: I569749166177c25e63b32fb468dccd13797acc05
 2020-04-23 14:52:58 -07:00
Clark DuVall
8f51d6b876 Reorder styleable attributes in shared libraries 
This is a similar fix to
https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/10109386
but deals with styleable attributes instead of style items.

Bug: 147674078
Test: JavaClassGeneratorTest.SortsDynamicAttributesAfterFrameworkAttributes
Change-Id: Ida6572cf07e2b5987e9d8941cf169a37c43578c4
 2020-04-22 13:19:28 -07:00
Muhammad Qureshi
de175bd5c1 Merge "Remove kMaxPushedAtomId from atoms_info." into rvc-dev am: e3ef95cf13 am: b7cee13a26 am: 9d742b25eb am: 400d598600 
Change-Id: I5097522fb575a0310414fe8983142058fff8fd89
 2020-04-18 01:10:52 +00:00
Muhammad Qureshi
b7cee13a26 Merge "Remove kMaxPushedAtomId from atoms_info." into rvc-dev am: e3ef95cf13 
Change-Id: Iff16f161dccbe653331d378660730a268c6c50fb
 2020-04-18 00:24:01 +00:00
Muhammad Qureshi
e3ef95cf13 Merge "Remove kMaxPushedAtomId from atoms_info." into rvc-dev 2020-04-18 00:13:52 +00:00
Muhammad Qureshi
866807d81c Merge "Remove kAtomsWithAttributionChain from atoms_info" into rvc-dev am: 9a89a81625 am: 29e6e92135 am: 6bfd13fc86 am: 0aaaf07791 
Change-Id: I9137d14e7579d6ebbfcd0135c15a535c3b1d7ef3
 2020-04-17 18:32:59 +00:00
Muhammad Qureshi
6bfd13fc86 Merge "Remove kAtomsWithAttributionChain from atoms_info" into rvc-dev am: 9a89a81625 am: 29e6e92135 
Change-Id: I6762a0ca526b4551828fe2355e1c59fab369ce95
 2020-04-17 17:22:26 +00:00
Muhammad Qureshi
3429cb905d Merge "Remove kAtomsWithAttributionChain from atoms_info" into rvc-dev am: 9a89a81625 
Change-Id: Id2b3cef4e6e7575a3ca2bf7fe024981aacdbce3a
 2020-04-17 17:22:18 +00:00
Muhammad Qureshi
cdf291d297 Remove kMaxPushedAtomId from atoms_info. 
Hardcode kMaxPushedAtomId in StatsdStats.

Bug: 154164020
Test: bit statsd_test:*
Change-Id: Ibca731d9783686a9e3caf0ad580e1d62038d68e2
 2020-04-17 10:10:17 -07:00
Muhammad Qureshi
9a89a81625 Merge "Remove kAtomsWithAttributionChain from atoms_info" into rvc-dev 2020-04-17 17:05:32 +00:00
TreeHugger Robot
a4243cf938 Merge "Update privacy filter for incident report protos." into rvc-dev am: f9a1e1cb78 am: 19ad54b69c am: 2fc75dae0b am: d81c126512 
Change-Id: I35701293ebb6242d7183d00e858397d296295c86
 2020-04-17 16:29:28 +00:00
TreeHugger Robot
2fc75dae0b Merge "Update privacy filter for incident report protos." into rvc-dev am: f9a1e1cb78 am: 19ad54b69c 
Change-Id: I4acf3127667285ab8723d41ee9e922079198ecec
 2020-04-17 15:41:10 +00:00
TreeHugger Robot
4d6fe955a1 Merge "Update privacy filter for incident report protos." into rvc-dev am: f9a1e1cb78 
Change-Id: Iec36c4aefa30458b50aa4a7838be039359e6e168
 2020-04-17 15:20:26 +00:00
TreeHugger Robot
f9a1e1cb78 Merge "Update privacy filter for incident report protos." into rvc-dev 2020-04-17 15:10:21 +00:00
Muhammad Qureshi
7fee54bb27 Remove kAtomsWithAttributionChain from atoms_info 
Use LogEvent::getAttributionChainIndex() to check presence of
attribution chains

Bug: 150414252
Test: bit statsd_test:*
Change-Id: Ic798d3b182c2b5aaf73444f2796d539cd3f7bf40
 2020-04-16 21:51:44 -07:00