Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
550,678 Commits 3 Branches 0 Tags
088c93be826e61ba6bd53e4df1013cccca247487
Commit Graph

8085 Commits

Author SHA1 Message Date
Treehugger Robot
56f4d81625 Merge "Use device SKU for Build.SKU instead of product/odm SKU" am: d1acd32722 am: 5dbd259527 am: 61538a7ff8 am: a7c5165065 am: e24d7836f5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318696

Change-Id: Ib0a7dda8337b7dc5787a16c7ef0877de6f53ffd5
 2020-06-02 22:07:28 +00:00
Treehugger Robot
61538a7ff8 Merge "Use device SKU for Build.SKU instead of product/odm SKU" am: d1acd32722 am: 5dbd259527 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318696

Change-Id: I60137d2247a7a7033d04f669f4f90c5e2644c218
 2020-06-02 21:17:20 +00:00
Treehugger Robot
5dbd259527 Merge "Use device SKU for Build.SKU instead of product/odm SKU" am: d1acd32722 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318696

Change-Id: Ida9865813088b5b1c6a0d0a728acb93dbe75cfda
 2020-06-02 21:01:22 +00:00
Treehugger Robot
d1acd32722 Merge "Use device SKU for Build.SKU instead of product/odm SKU" 2020-06-02 20:48:33 +00:00
Martijn Coenen
f57e83a7ab Merge "Use killProcessGroup when killing app zygote." into rvc-dev am: 0a8ef2b45f am: f1e067d713 am: f869b24229 am: 4c8aee3353 
Original change: undetermined

Change-Id: Iee1981634307d308f48d6d87ef8c015d4526ed58
 2020-06-02 07:53:38 +00:00
Martijn Coenen
f869b24229 Merge "Use killProcessGroup when killing app zygote." into rvc-dev am: 0a8ef2b45f am: f1e067d713 
Original change: undetermined

Change-Id: I25071384d81546fa3df105addebf15db9c18439b
 2020-06-02 07:22:24 +00:00
Martijn Coenen
5dab822067 Merge "Use killProcessGroup when killing app zygote." into rvc-dev am: 0a8ef2b45f 
Original change: undetermined

Change-Id: I6033bc141efd30efb832c8cde26a2312d4f3c177
 2020-06-02 07:08:35 +00:00
Martijn Coenen
0a8ef2b45f Merge "Use killProcessGroup when killing app zygote." into rvc-dev 2020-06-02 06:54:46 +00:00
Jeff Sharkey
2a9c894546 Merge "Revert "Apps shouldn't be disabling StrictMode checks."" into rvc-dev am: c99a508218 am: 07f0ad39dd am: b06ac1bb6f am: dde912353d 
Change-Id: Ic95699c898471701c06d44f7d918d52337c09df6
 2020-06-01 16:39:39 +00:00
Jeff Sharkey
b06ac1bb6f Merge "Revert "Apps shouldn't be disabling StrictMode checks."" into rvc-dev am: c99a508218 am: 07f0ad39dd 
Change-Id: I7dac790e4d20497fd4f07494152d775d69b2d3f2
 2020-06-01 16:15:34 +00:00
Jeff Sharkey
459f2c806b Merge "Revert "Apps shouldn't be disabling StrictMode checks."" into rvc-dev am: c99a508218 
Change-Id: I5d4a4161fa0c9e9ab8bef9a543c357bab4576408
 2020-06-01 16:04:05 +00:00
Jeff Sharkey
c99a508218 Merge "Revert "Apps shouldn't be disabling StrictMode checks."" into rvc-dev 2020-06-01 15:55:14 +00:00
Jeff Sharkey
3080fb7c9e Revert "Apps shouldn't be disabling StrictMode checks." 
This reverts commit 14e961870a.

Reason for revert: satayev@
Bug: 156336269

Change-Id: Ic0d3a650156c06f58fce4c28157191f4497469f0
 2020-06-01 15:54:41 +00:00
Jeff Sharkey
8961f33690 Merge "Support getStorageVolume() for synthetic volumes." into rvc-dev am: fd71805e1c am: f7b86769e3 am: f0b4a1356c am: 3a08fef6bd 
Change-Id: I69d33800a0537c764e94af14d0eb19a5fe59bd92
 2020-06-01 15:18:28 +00:00
Jeff Sharkey
32098bd066 Merge "Apps shouldn't be disabling StrictMode checks." into rvc-dev am: 4d96602de0 am: 2101337142 am: 519a77b3fe am: 2f34b7d589 
Change-Id: I862f71362fd102803e486ff46731f46ec4c4d807
 2020-06-01 15:17:55 +00:00
Jeff Sharkey
3a08fef6bd Merge "Support getStorageVolume() for synthetic volumes." into rvc-dev am: fd71805e1c am: f7b86769e3 am: f0b4a1356c 
Change-Id: I21b4a5d239fbc0d2812efcfecf2bc80664cd0615
 2020-06-01 15:05:32 +00:00
Jeff Sharkey
2f34b7d589 Merge "Apps shouldn't be disabling StrictMode checks." into rvc-dev am: 4d96602de0 am: 2101337142 am: 519a77b3fe 
Change-Id: I21a763c4d87b7b9f13600eb8b9f0ec392ba081cc
 2020-06-01 15:05:06 +00:00
Jeff Sharkey
e42cbb8704 Merge "Support getStorageVolume() for synthetic volumes." into rvc-dev am: fd71805e1c 
Change-Id: I5f6675f1514ed308014e833d28e1b3a3cbe8c93a
 2020-06-01 14:38:01 +00:00
Jeff Sharkey
f05d514436 Merge "Apps shouldn't be disabling StrictMode checks." into rvc-dev am: 4d96602de0 
Change-Id: Iaf92a5949c9196d5d4194322e360d114325a4eea
 2020-06-01 14:37:23 +00:00
Jeff Sharkey
fd71805e1c Merge "Support getStorageVolume() for synthetic volumes." into rvc-dev 2020-06-01 14:18:32 +00:00
Jeff Sharkey
4d96602de0 Merge "Apps shouldn't be disabling StrictMode checks." into rvc-dev 2020-06-01 14:16:54 +00:00
Automerger Merge Worker
a7852c0354 Merge "Merge "Fixed how ShellCommand show exceptions." into rvc-dev am: 725f9cea7f am: 31701635b9 am: f77ead2431" into rvc-qpr-dev-plus-aosp am: 7b4ade5398 
Change-Id: I23eddda7e68aafe2cd25697284b5816ffdf22096
 2020-05-29 23:35:12 +00:00
TreeHugger Robot
62d781beee Merge "Fixed how ShellCommand show exceptions." into rvc-dev am: 725f9cea7f am: 31701635b9 am: f77ead2431 
Change-Id: I1370391a39f0d2ccf2a3d972d78936d726c8d5e8
 2020-05-29 23:25:51 +00:00
TreeHugger Robot
4af2991795 Merge "Fixed how ShellCommand show exceptions." into rvc-dev am: 725f9cea7f 
Change-Id: I2b8d3c4941c79663d5f02e16b244801bbd7d97ea
 2020-05-29 23:01:16 +00:00
Treehugger Robot
2ce4a43a63 Merge "Add ParcelableHolder type" am: 7d2fc62868 am: 841a116b7e am: df04459b1d am: 31ff9ce67c am: b587a7f47c 
Change-Id: I09c496762038f6972e0eb8ac82c93ac5c638c721
 2020-05-29 22:56:39 +00:00
Treehugger Robot
df04459b1d Merge "Add ParcelableHolder type" am: 7d2fc62868 am: 841a116b7e 
Change-Id: Ibb9629999638c868e453889592b8290673be04c9
 2020-05-29 22:08:18 +00:00
Treehugger Robot
841a116b7e Merge "Add ParcelableHolder type" am: 7d2fc62868 
Change-Id: If7258d57ff14020c3127aa7eadd892ed51301cd4
 2020-05-29 21:42:41 +00:00
felipeal
283e3c388d Fixed how ShellCommand show exceptions. 
Prior to this change, it was duplicating the exception. Example:

$ adb shell cmd car_service create-user --flags 4444 --timeout 100 --hal-only Dude

Exception occurred while executing: new user flags mismatch on existing users on {.requestId = 2, .newUserInfo = {.userId = 11, .flags = 0x115c}, .newUserName = Dude, .usersInfo = {.currentUser = {.userId = 11, .flags = NONE}, .numberUsers = 3, .existingUsers = [{.userId = 0, .flags = 0x9}, {.userId = 10, .flags = ADMIN}, {.userId = 11, .flags = NONE}]}}
java.lang.IllegalArgumentException: new user flags mismatch on existing users on {.requestId = 2, .newUserInfo = {.userId = 11, .flags = 0x115c}, .newUserName = Dude, .usersInfo = {.currentUser = {.userId = 11, .flags = NONE}, .numberUsers = 3, .existingUsers = [{.userId = 0, .flags = 0x9}, {.userId = 10, .flags = ADMIN}, {.userId = 11, .flags = NONE}]}}
	at com.android.internal.util.Preconditions.checkArgument(Preconditions.java:69)
	at android.car.userlib.UserHalHelper.toVehiclePropValue(UserHalHelper.java:503)
	at com.android.car.hal.UserHalService.createUser(UserHalService.java:339)

Now it's showing the failed command instead:

Exception occurred while executing 'create-user --flags 4444 --timeout 100 --hal-only Dude':
java.lang.IllegalArgumentException: new user flags mismatch on existing users on {.requestId = 2, .newUserInfo = {.userId = 11, .flags = 0x115c}, .newUserName = Dude, .usersInfo = {.currentUser = {.userId = 11, .flags = NONE}, .numberUsers = 3, .existingUsers = [{.userId = 0, .flags = 0x9}, {.userId = 10, .flags = ADMIN}, {.userId = 11, .flags = NONE}]}}
	at com.android.internal.util.Preconditions.checkArgument(Preconditions.java:69)
	at android.car.userlib.UserHalHelper.toVehiclePropValue(UserHalHelper.java:503)
	at com.android.car.hal.UserHalService.createUser(UserHalService.java:339)

Test: manual verification
Bug: 150408921

Change-Id: I42221fbe2410770b0755c32d16620acc71d8d5d2
 2020-05-29 21:21:56 +00:00
Martijn Coenen
6bec07ec39 Use killProcessGroup when killing app zygote. 
To make sure we kill all untracked children, too.

Bug: 156741968
Bug: 157598956
Test: manual inspection, PoC no longer works.
Change-Id: I5d8efeb05ddec08a7fc7c00eabca6590c4cfdd8c
 2020-05-29 14:49:25 +02:00
Treehugger Robot
7d2fc62868 Merge "Add ParcelableHolder type" 2020-05-29 04:05:46 +00:00
Jeff Sharkey
88818fe7b2 Support getStorageVolume() for synthetic volumes. 
The MediaStore.VOLUME_EXTERNAL volume is a synthetic collection of
all currently mounted storage volumes, so if someone wants to find
the underlying StorageVolume for one of these Uris, we need to query
to resolve the real volume name.

Bug: 153664437
Test: atest android.provider.cts.MediaStoreTest
Change-Id: I7b28ba3bfd5b7a4cc577830940de4a2e1cbd1932
 2020-05-28 19:18:40 -06:00
Jeff Sharkey
14e961870a Apps shouldn't be disabling StrictMode checks. 
Since Android N we've helpfully guided apps towards using content://
Uris when sharing data, but some obstinate apps have tried bypassing
these helpful checks.  Since we're finally changing the storage model
in Android R, we really to communicate strongly that apps must be
using content://, and these methods should not be used.

Bug: 156336269
Test: manual
Change-Id: Id8707ecb51f3a24747b4c84d86c70591fb5f7ffc
 2020-05-28 15:34:11 -06:00
Robin Lee
7b772fdcd1 Use device SKU for Build.SKU instead of product/odm SKU 
Change-Id: I9c8bebf04cf0fa1a9cfd5211ea53c38bfb0affa7
Test: atest android.os.cts.BuildTest
Bug: 155840001
Bug: 151157621
 2020-05-28 07:39:54 +00:00
Songchun Fan
49c515ac0f Merge "[incremental] respect extractNativeLibs in native lib config" into rvc-dev am: f2a6af4b8a am: 8ecea0c1ce am: 1f5799ffdc am: 80ee4058e8 
Change-Id: I3fa99b04bc249163f84b1639e29f323cc92eed6f
 2020-05-28 01:24:33 +00:00
Songchun Fan
80ee4058e8 Merge "[incremental] respect extractNativeLibs in native lib config" into rvc-dev am: f2a6af4b8a am: 8ecea0c1ce am: 1f5799ffdc 
Change-Id: Ib18aeefdc763c318f6c99f704abf016820d45dbd
 2020-05-28 01:06:06 +00:00
Songchun Fan
b8e087607b Merge "[incremental] respect extractNativeLibs in native lib config" into rvc-dev am: f2a6af4b8a 
Change-Id: Ibc96844cf6737663c48c9133b49bc9c972ed632f
 2020-05-28 00:59:35 +00:00
Songchun Fan
f2a6af4b8a Merge "[incremental] respect extractNativeLibs in native lib config" into rvc-dev 2020-05-27 22:17:23 +00:00
Songchun Fan
14f6c3c735 [incremental] respect extractNativeLibs in native lib config 
Makes sure the behavior is consistent with legacy installs:

When the flag is on, the native libs will be extracted to subdirs under
lib/.
When the flag is off, the lib/ subdirs will be created but the native
libs are not extracted.
When the flag is off, check if the native libs are uncompressed and well
aligned.

Test: atest android.extractnativelibs.cts.CtsExtractNativeLibsHostTest
BUG: 157173358
Change-Id: Idb57fd7ca1115f787faf5cde3056c32ff3f60890
 2020-05-27 22:16:57 +00:00
Adam Bookatz
8676d3b4c0 Merge "Unify multiuser switcher enabled setting" into rvc-dev am: 203a17d955 am: 7ea82860a5 am: ef92bf2f6d am: 9257fdb767 
Change-Id: I27de1d7a0a556aefd431e47bf94d92d59b76f210
 2020-05-27 18:17:10 +00:00
Adam Bookatz
ef92bf2f6d Merge "Unify multiuser switcher enabled setting" into rvc-dev am: 203a17d955 am: 7ea82860a5 
Change-Id: Ic82db764e341049ce8e3a6ba92f01ae020e9e656
 2020-05-27 17:55:21 +00:00
Adam Bookatz
4440fc60bf Merge "Unify multiuser switcher enabled setting" into rvc-dev am: 203a17d955 
Change-Id: If70ef74c9dcaf1071324cf093aeec1db7196786b
 2020-05-27 17:32:20 +00:00
Adam Bookatz
203a17d955 Merge "Unify multiuser switcher enabled setting" into rvc-dev 2020-05-27 17:15:33 +00:00
Alex Johnston
d6da393c0c Merge "Per-profile user restrictions in org-owned managed profile" into rvc-dev am: 155d909a08 am: f997f9a430 am: cab624e1d1 am: 247d47d854 
Change-Id: I55ad1168a73ade61dcb1519c4e81ab7f7b18570f
 2020-05-27 14:10:17 +00:00
Alex Johnston
247d47d854 Merge "Per-profile user restrictions in org-owned managed profile" into rvc-dev am: 155d909a08 am: f997f9a430 am: cab624e1d1 
Change-Id: Ie8f990789426fa820843863a6d79e79872f425fe
 2020-05-27 13:47:53 +00:00
Alex Johnston
5abed10363 Merge "Per-profile user restrictions in org-owned managed profile" into rvc-dev am: 155d909a08 
Change-Id: I93687c3754b13bd72a53de49ce058211266bca64
 2020-05-27 13:25:39 +00:00
Alex Johnston
155d909a08 Merge "Per-profile user restrictions in org-owned managed profile" into rvc-dev 2020-05-27 13:12:43 +00:00
Automerger Merge Worker
38326ba6db Merge "Merge "Lifecycle: detecting blocked and unhealthy." into rvc-dev am: 4e5ff2eb7d am: 1ad652187c am: d1de4941b5" into rvc-qpr-dev-plus-aosp am: 3aa26d15b9 
Change-Id: Ie1e8f3240286008bf0c6db0adaae2f8dce36c6f6
 2020-05-27 05:13:09 +00:00
Alex Buynytskyy
fa6c8aee66 Merge "Lifecycle: detecting blocked and unhealthy." into rvc-dev am: 4e5ff2eb7d am: 1ad652187c am: d1de4941b5 
Change-Id: I2f099f41419d4232470094c2f7fa29ad5cc616a9
 2020-05-27 04:49:11 +00:00
Alex Buynytskyy
53ea003df2 Merge "Lifecycle: detecting blocked and unhealthy." into rvc-dev am: 4e5ff2eb7d 
Change-Id: If0f24b8549fbf78aecf4586551528606064ecfe7
 2020-05-27 04:17:10 +00:00
Brad Ebinger
b9677fd658 Merge "Add clearAll method to RegistrantList for easier cleanup" am: e3f505a02d 
Change-Id: I0f3d742b83488a649bac48bf52863fb188242cfc
 2020-05-26 23:30:16 +00:00