Tom Cherry
60311e153f
Merge "Document that SystemProperties.set() can throw RuntimeException" am: 6265eea819 am: 14a2b65e4e am: f5269ed927
...
am: 1a8cd03fbc
2019-09-19 23:59:07 -07:00
Tom Cherry
1a8cd03fbc
Merge "Document that SystemProperties.set() can throw RuntimeException" am: 6265eea819 am: 14a2b65e4e
...
am: f5269ed927
2019-09-19 23:47:30 -07:00
Tom Cherry
f5269ed927
Merge "Document that SystemProperties.set() can throw RuntimeException" am: 6265eea819
...
am: 14a2b65e4e
2019-09-19 23:29:49 -07:00
Tom Cherry
14a2b65e4e
Merge "Document that SystemProperties.set() can throw RuntimeException"
...
am: 6265eea819
2019-09-19 23:17:26 -07:00
Treehugger Robot
6265eea819
Merge "Document that SystemProperties.set() can throw RuntimeException"
2019-09-20 05:53:03 +00:00
TreeHugger Robot
5cb2cffb89
Merge "Add comment that mWrapped ==> mClosed"
2019-09-19 23:47:06 +00:00
Tom Cherry
39373b2e81
Document that SystemProperties.set() can throw RuntimeException
...
Bug: 140148206
Test: n/a
Change-Id: I32df2ed4979edcc0d9abc46830ebd3defc431c57
2019-09-19 08:41:44 -07:00
Victor Hsieh
1ee0eecf66
Merge "Mirror fs-verity ownership UID to Java" am: d6b817cd51 am: 9b83a708c7 am: 1863e70b22
...
am: 24c2c60951
2019-09-18 18:34:23 -07:00
Victor Hsieh
24c2c60951
Merge "Mirror fs-verity ownership UID to Java" am: d6b817cd51 am: 9b83a708c7
...
am: 1863e70b22
2019-09-18 18:27:18 -07:00
Victor Hsieh
1863e70b22
Merge "Mirror fs-verity ownership UID to Java" am: d6b817cd51
...
am: 9b83a708c7
2019-09-18 18:15:40 -07:00
Victor Hsieh
9b83a708c7
Merge "Mirror fs-verity ownership UID to Java"
...
am: d6b817cd51
2019-09-18 18:04:36 -07:00
Victor Hsieh
3c68afee05
Mirror fs-verity ownership UID to Java
...
This has been done in system/core, so mirroring for later use.
https://android-review.googlesource.com/c/platform/system/core/+/1115493
Test: compile
Bug: 112038744
Change-Id: I2d7f5d38caae0b6ada1f208b3d71d937d527716e
2019-09-18 14:33:54 -07:00
Yifan Hong
08d33aaa0f
Merge "VintfObject: Fix getHalNamesAndVersions doc" am: bc45ac13ef am: c109452058 am: 6479d51ebb
...
am: 31e27a148b
2019-09-16 18:03:43 -07:00
Yifan Hong
31e27a148b
Merge "VintfObject: Fix getHalNamesAndVersions doc" am: bc45ac13ef am: c109452058
...
am: 6479d51ebb
2019-09-16 17:50:34 -07:00
Yifan Hong
6479d51ebb
Merge "VintfObject: Fix getHalNamesAndVersions doc" am: bc45ac13ef
...
am: c109452058
2019-09-16 17:38:00 -07:00
Yifan Hong
c109452058
Merge "VintfObject: Fix getHalNamesAndVersions doc"
...
am: bc45ac13ef
2019-09-16 17:19:58 -07:00
Yifan Hong
bc45ac13ef
Merge "VintfObject: Fix getHalNamesAndVersions doc"
2019-09-16 23:58:51 +00:00
Tao Bao
2a0b7e3405
Merge "Add nullability anotations" am: 7e3b406f26 am: 8123e5cc50 am: d4897c7dbf
...
am: 73babb3463
2019-09-13 11:07:25 -07:00
Tao Bao
73babb3463
Merge "Add nullability anotations" am: 7e3b406f26 am: 8123e5cc50
...
am: d4897c7dbf
2019-09-13 10:56:22 -07:00
Tao Bao
d4897c7dbf
Merge "Add nullability anotations" am: 7e3b406f26
...
am: 8123e5cc50
2019-09-13 10:41:54 -07:00
Tao Bao
8123e5cc50
Merge "Add nullability anotations"
...
am: 7e3b406f26
2019-09-13 10:28:21 -07:00
Kyeongkab.Nam
77f1aac15d
Add nullability anotations
...
Add missing nullability for applyPayload.
Test: manual
Change-Id: Iafce9091767bd7a31937b0be329ede6639239d73
2019-09-12 11:33:39 +09:00
Ying Zheng
215116f8cb
Not support flag primary in headless system user mode for now.
...
Test: build
Bug: 139950070
Change-Id: I5b06cb857fa1917f479c3018963970743b211087
2019-09-11 14:04:13 -07:00
Yifan Hong
0cdba3256c
VintfObject: Fix getHalNamesAndVersions doc
...
Test: CTS device info collect
Bug: 140832836
Change-Id: Iddc3c36d15370baa661e485b76c490a5d2b7815c
2019-09-11 11:07:43 -07:00
Varun Shah
7fcf86ed49
Merge "Use language tags to store Configuration's locale list." into qt-dev am: 6dfa267f91 am: 6947f255e4
...
am: 667db1bea5
2019-09-10 23:42:08 -07:00
Varun Shah
667db1bea5
Merge "Use language tags to store Configuration's locale list." into qt-dev am: 6dfa267f91
...
am: 6947f255e4
2019-09-10 23:36:07 -07:00
Varun Shah
019d50c70b
Merge "Use language tags to store Configuration's locale list." into qt-dev am: 6dfa267f91
...
am: 6947f255e4
2019-09-10 23:36:05 -07:00
Varun Shah
6947f255e4
Merge "Use language tags to store Configuration's locale list." into qt-dev
...
am: 6dfa267f91
2019-09-10 23:29:10 -07:00
Varun Shah
5e67462971
Use language tags to store Configuration's locale list.
...
Instead of storing each Locale within a Configuration object's locale
list by its language, country, variant, and script to proto, store the
entire locale list by its language tags representation which accurately
describes each locale.
Bug: 140197723
Test: atest ConfigurationTest
Test: atest UsageStatsDatabaseTest
Test: manually with bad data
Merged-In: I53946ed4e31de0ffe9c84875c391a7dec6f5375a
Change-Id: Idaae690f79a5c680ad0059a52be62160d9dfb5e7
2019-09-10 19:53:57 +00:00
Varun Shah
bd0ce4d42f
Use language tags to store Configuration's locale list.
...
Instead of storing each Locale within a Configuration object's locale
list by its language, country, variant, and script to proto, store the
entire locale list by its language tags representation which accurately
describes each locale.
Bug: 140197723
Test: atest ConfigurationTest
Test: atest UsageStatsDatabaseTest
Test: manually with bad data
Change-Id: I53946ed4e31de0ffe9c84875c391a7dec6f5375a
2019-09-10 15:51:37 -04:00
Colin Cross
ca4f16d099
Merge "Revert "Use language tags to store Configuration's locale list."" into qt-dev am: dd67a548b2 am: 18bf694f3c
...
am: c09f17d559
2019-09-10 12:43:01 -07:00
Colin Cross
fb5d404e5b
Merge "Revert "Use language tags to store Configuration's locale list."" into qt-dev am: dd67a548b2
...
am: 18bf694f3c
2019-09-10 12:36:03 -07:00
Colin Cross
c09f17d559
Merge "Revert "Use language tags to store Configuration's locale list."" into qt-dev am: dd67a548b2
...
am: 18bf694f3c
2019-09-10 12:36:03 -07:00
Colin Cross
18bf694f3c
Merge "Revert "Use language tags to store Configuration's locale list."" into qt-dev
...
am: dd67a548b2
2019-09-10 12:29:07 -07:00
Varun Shah
68cdb74d91
Revert "Use language tags to store Configuration's locale list."
...
This reverts commit ff43f4e6a6
2019-09-10 18:30:47 +00:00
Xin Li
d57e959e71
Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
...
Bug: 135460123
Change-Id: I65906d82b14125c0893d5cde0cfebb73bf9e38ab
Merged-In: I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9
2019-09-10 11:16:29 -07:00
Varun Shah
fe560ba5f2
Merge "Use language tags to store Configuration's locale list." into qt-dev am: bdfd7d6adb am: ec466c0a8e
...
am: 6540f10816
2019-09-10 10:27:58 -07:00
Varun Shah
6540f10816
Merge "Use language tags to store Configuration's locale list." into qt-dev am: bdfd7d6adb
...
am: ec466c0a8e
2019-09-10 10:17:23 -07:00
Varun Shah
18ed0b77a7
Merge "Use language tags to store Configuration's locale list." into qt-dev am: bdfd7d6adb
...
am: ec466c0a8e
2019-09-10 10:17:23 -07:00
Varun Shah
ec466c0a8e
Merge "Use language tags to store Configuration's locale list." into qt-dev
...
am: bdfd7d6adb
2019-09-10 10:10:25 -07:00
Varun Shah
ff43f4e6a6
Use language tags to store Configuration's locale list.
...
Instead of storing each Locale within a Configuration object's locale
list by its language, country, variant, and script to proto, store the
entire locale list by its language tags representation which accurately
describes each locale.
Bug: 140197723
Test: atest ConfigurationTest
Test: atest UsageStatsDatabaseTest
Test: manually with bad data
Change-Id: Id0e63ae4a7be578d1e93838b371320f86a787e0e
2019-09-09 22:41:54 +00:00
Treehugger Robot
59566aba2e
Merge "Fix regression in PFD#fromData"
2019-09-09 19:21:04 +00:00
TreeHugger Robot
2257e8b62d
Merge "int userHandle -> int userId"
2019-09-06 18:08:08 +00:00
Blake Kragten
da96cb4086
Merge "Connection change and high tx power Q port Changed missed Q merge back in April" into qt-qpr1-dev
...
am: cf1268a5f5
2019-09-06 11:03:30 -07:00
Blake Kragten
cf1268a5f5
Merge "Connection change and high tx power Q port Changed missed Q merge back in April" into qt-qpr1-dev
2019-09-06 17:03:30 +00:00
Bookatz
f56f258495
int userHandle -> int userId
...
Throughout the codebase, sometimes an integer user ID is called
userId, and sometimes it is called userHandle. Here, we rename the
occurences of "int userHandle" to "int userId" in select files.
Additionally, we add the @UserIdInt annotation in many more places.
This certainly does not cover all uses of userHandle, which is used
widely throughout Android; doing so would be more dangerous and cause
merge conflicts. But at least the core User code can have a consistent
nomenclature.
Bug: 138384792
Test: compiles. presubmit passes.
Change-Id: I9a2684e9bfac637e0476c4b68027008ebb8a160b
2019-09-06 09:26:35 -07:00
Blake Kragten
bc75c727b7
Connection change and high tx power Q port
...
Changed missed Q merge back in April
Cherrypicking change into Q for better metrics.
Batterystats: "none" Data connection state should reflect only out of service
Moved only out of service to unknown type position and added other
network type.
BUG: 128629695
Test: flashed on target and tested in out of service mode. Ran
dumpsys/bugreport. adb shell dumpsys batterystats
Cellular high tx power bug
Previous implementaion was not correctly registering tx high power
sections. To fix this we can send a clear flag after we send a
+cellular_high_tx_power. We need to do this so in the volta historian
data we only see a small segment to where the tx power was at before
this.
This will generate less confusion with the cellular_high_tx_power
Bug: 127640604
Test: Compiled and flashed onto device. Tested uploading long video to
google photos. This created a high tx power use case for me to test that
the feature was reporting correctly.
Bug: 139947280
Merge-Merged-6bf8ef5
Change-Id: I6a438c9fed411a49b1f36a8085863803ff53737b
2019-08-30 15:06:03 -07:00
Steven Moreland
15acebb039
Merge changes from topic "wait-for-aidl" into stage-aosp-master am: d6b5bdf07d am: 4955049ace am: 11912440c5
...
am: fac32905f9
2019-08-30 12:08:45 -07:00
TreeHugger Robot
8e6a69c3a2
Merge "Allow apps to collect which appops were noted"
2019-08-30 18:53:22 +00:00
Steven Moreland
fac32905f9
Merge changes from topic "wait-for-aidl" into stage-aosp-master am: d6b5bdf07d am: 4955049ace
...
am: 11912440c5
2019-08-30 11:48:29 -07:00
