OSDN Git Service

android-x86/frameworks-base.git
5 years agoMerge "Separate privapp grant for dialer" am: 5d7fc9568e
Anton Hansson [Tue, 5 Feb 2019 05:22:03 +0000 (21:22 -0800)]
Merge "Separate privapp grant for dialer" am: 5d7fc9568e
am: ce448e631b

Change-Id: Ie21c9f81e3cf92a9c88a10a029bc1eb3f4848f91

5 years agoMerge "Improve AsyncTask API documentation" am: 1cbb20b2df
Hans Boehm [Tue, 5 Feb 2019 05:16:57 +0000 (21:16 -0800)]
Merge "Improve AsyncTask API documentation" am: 1cbb20b2df
am: 8f39deb490

Change-Id: Idd279158405207d9afac604b8acc6bf49232cb2f

5 years agoMerge "Replace hardcoded cgroup paths" am: 1e4b9d7583
Suren Baghdasaryan [Tue, 5 Feb 2019 04:56:48 +0000 (20:56 -0800)]
Merge "Replace hardcoded cgroup paths" am: 1e4b9d7583
am: 26cbd94d67

Change-Id: I9bd49a1757384bf72902fca46695fad237ce09ff

5 years ago[automerger skipped] Merge "Add NR to preferred network type combination" am: 996f047394
Chen Xu [Tue, 5 Feb 2019 04:50:08 +0000 (20:50 -0800)]
[automerger skipped] Merge "Add NR to preferred network type combination" am: 996f047394
am: 21cdfe4c14 -s ours
am skip reason: change_id I08a8f7bf44a62ef109583b82b22f65fd6f89c71d with SHA1 32993551f3 is in history

Change-Id: I699396e5ecc42551939fcd39716a9fc4d6e0c6fd

5 years agoAdd NR to preferred network type combination
chen xu [Thu, 31 Jan 2019 08:44:52 +0000 (00:44 -0800)]
Add NR to preferred network type combination

This add NR 5G to preferred network type and move preferredNetworkMode
from SystemApi to hidden api as we are not going to support
preferredNetworMode enum in the future.

Bug: 111453000
Test: build
Change-Id: I08a8f7bf44a62ef109583b82b22f65fd6f89c71d
(cherry picked from commit 8bcdc4cf66e9d654fa31d7c62654ff81ee04cdc6)
Merged-in: I08a8f7bf44a62ef109583b82b22f65fd6f89c71d

5 years agoMerge "Add closing div tag for ContentResolver javadoc" into pi-dev
Ng Zhi An [Mon, 4 Feb 2019 19:52:44 +0000 (11:52 -0800)]
Merge "Add closing div tag for ContentResolver javadoc" into pi-dev
am: a3a280e4d8

Change-Id: I12f32a13f8b6ca1c33bee80207c6e1bed6f7cb4b

5 years agoMerge "Add closing div tag for ContentResolver javadoc" into pi-dev
TreeHugger Robot [Mon, 4 Feb 2019 19:38:42 +0000 (19:38 +0000)]
Merge "Add closing div tag for ContentResolver javadoc" into pi-dev

5 years agoMerge "Separate privapp grant for dialer"
Anton Hansson [Mon, 4 Feb 2019 12:35:11 +0000 (04:35 -0800)]
Merge "Separate privapp grant for dialer"
am: 5d7fc9568e

Change-Id: I30db428e48ac0b15adfb78f222e78dd45512d032

5 years agoMerge "Separate privapp grant for dialer"
Anton Hansson [Mon, 4 Feb 2019 12:23:47 +0000 (12:23 +0000)]
Merge "Separate privapp grant for dialer"

5 years agoMerge "Improve AsyncTask API documentation"
Hans Boehm [Mon, 4 Feb 2019 04:27:02 +0000 (20:27 -0800)]
Merge "Improve AsyncTask API documentation"
am: 1cbb20b2df

Change-Id: Iabd8dd663c718f9467a9bf19a7feb4be76f01901

5 years agoMerge "Replace hardcoded cgroup paths"
Suren Baghdasaryan [Mon, 4 Feb 2019 04:11:37 +0000 (20:11 -0800)]
Merge "Replace hardcoded cgroup paths"
am: 1e4b9d7583

Change-Id: Idb41db6bbcacdfc14b63973f8e6ab0011a18d543

5 years agoMerge "Improve AsyncTask API documentation"
Hans Boehm [Mon, 4 Feb 2019 01:20:56 +0000 (01:20 +0000)]
Merge "Improve AsyncTask API documentation"

5 years agoMerge "Replace hardcoded cgroup paths"
Suren Baghdasaryan [Sun, 3 Feb 2019 22:28:22 +0000 (22:28 +0000)]
Merge "Replace hardcoded cgroup paths"

5 years agoReplace hardcoded cgroup paths
Suren Baghdasaryan [Fri, 14 Dec 2018 18:32:22 +0000 (10:32 -0800)]
Replace hardcoded cgroup paths

Replace hardcoded cgroup paths with new processgroup library API calls,
include required headers. Add required dependencies.

Bug: 111307099
Test: builds, boots

Change-Id: Ic2dc2a94328cf1927fafaa9506537aeb213df413
Merged-In: Ic2dc2a94328cf1927fafaa9506537aeb213df413
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
5 years agoMerge "Add NR to preferred network type combination"
Chen Xu [Sat, 2 Feb 2019 01:38:33 +0000 (17:38 -0800)]
Merge "Add NR to preferred network type combination"
am: 996f047394

Change-Id: I6587a17e035136f5adb0b40445676aac075207ab

5 years agoMerge "Add NR to preferred network type combination"
Chen Xu [Sat, 2 Feb 2019 01:24:00 +0000 (01:24 +0000)]
Merge "Add NR to preferred network type combination"

5 years agoMerge "Fix wrong userData length and excessive userData issues" am: 13d5d5a1c8
Amit Mahajan [Fri, 1 Feb 2019 22:54:23 +0000 (14:54 -0800)]
Merge "Fix wrong userData length and excessive userData issues" am: 13d5d5a1c8
am: 487b123d6f

Change-Id: Iff63e14e601d32e6991ad651b4dc0917be6c11e7

5 years agoMerge "Fix wrong userData length and excessive userData issues"
Amit Mahajan [Fri, 1 Feb 2019 22:43:30 +0000 (14:43 -0800)]
Merge "Fix wrong userData length and excessive userData issues"
am: 13d5d5a1c8

Change-Id: I84defa9bfb4a90f97834f59e0c221bb99668c2b9

5 years agoMerge "Fix wrong userData length and excessive userData issues"
Amit Mahajan [Fri, 1 Feb 2019 22:25:37 +0000 (22:25 +0000)]
Merge "Fix wrong userData length and excessive userData issues"

5 years agoMerge "Add signal strength converter" am: b8e4cd87de
Pengquan Meng [Fri, 1 Feb 2019 21:38:36 +0000 (13:38 -0800)]
Merge "Add signal strength converter" am: b8e4cd87de
am: 35bfc604b9

Change-Id: If56530867a8bfbffb25c60f62189c422851aeab0

5 years agoMerge "Add signal strength converter"
Pengquan Meng [Fri, 1 Feb 2019 21:27:55 +0000 (13:27 -0800)]
Merge "Add signal strength converter"
am: b8e4cd87de

Change-Id: Ibb2590097f705af73c802119aecf4acb518f413b

5 years agoMerge "Use the correct Smart Storage flag in SettingsLib." into pi-dev
Daniel Nishi [Fri, 1 Feb 2019 21:16:06 +0000 (13:16 -0800)]
Merge "Use the correct Smart Storage flag in SettingsLib." into pi-dev
am: b8c9dace53

Change-Id: Id04613a0bbe6c2147a9fc176c5add96d12ed6d46

5 years agoMerge "Add signal strength converter"
Pengquan Meng [Fri, 1 Feb 2019 21:09:46 +0000 (21:09 +0000)]
Merge "Add signal strength converter"

5 years agoMerge "Use the correct Smart Storage flag in SettingsLib." into pi-dev
Daniel Nishi [Fri, 1 Feb 2019 20:44:53 +0000 (20:44 +0000)]
Merge "Use the correct Smart Storage flag in SettingsLib." into pi-dev

5 years agoMerge "[viewcompiler] Support more than 16 registers in invoke instructions" am:...
Eric Holk [Fri, 1 Feb 2019 20:44:32 +0000 (12:44 -0800)]
Merge "[viewcompiler] Support more than 16 registers in invoke instructions" am: f96ebc501e
am: 18fa74cbe4

Change-Id: I2bbe8793d7bf3b1e06ec5576ba250f10a0f9c304

5 years agoMerge "Refresh cardId before using it." am: 84d250c18d
Jordan Liu [Fri, 1 Feb 2019 20:38:36 +0000 (12:38 -0800)]
Merge "Refresh cardId before using it." am: 84d250c18d
am: 5b3acb8d9b

Change-Id: Ie57153839c499d9972cd6267c4f926525fed1fde

5 years agoMerge "Deprecate acceptRingingCall and endCall." am: 6e3a88a3e2
Tyler Gunn [Fri, 1 Feb 2019 20:31:53 +0000 (12:31 -0800)]
Merge "Deprecate acceptRingingCall and endCall." am: 6e3a88a3e2
am: 280019629c

Change-Id: Ie2bc60b8c8f5abc1651944fa3f927b23ab545d0f

5 years agoMerge "Fix the wrong assignment" am: cf74daba15
Kyeongkab.Nam [Fri, 1 Feb 2019 20:22:49 +0000 (12:22 -0800)]
Merge "Fix the wrong assignment" am: cf74daba15
am: f8e84f8434

Change-Id: Ib97f79abfe85c7bb2b94aaa44a573d1cba15c329

5 years agoMerge "[viewcompiler] Support more than 16 registers in invoke instructions"
Eric Holk [Fri, 1 Feb 2019 19:46:25 +0000 (11:46 -0800)]
Merge "[viewcompiler] Support more than 16 registers in invoke instructions"
am: f96ebc501e

Change-Id: Ie5d39674bd90410e388c8b8c6173fa717fcf11b7

5 years agoMerge "Refresh cardId before using it."
Jordan Liu [Fri, 1 Feb 2019 19:41:40 +0000 (11:41 -0800)]
Merge "Refresh cardId before using it."
am: 84d250c18d

Change-Id: I09076401184087f57d4f15b7934abe603b9b85a2

5 years agoMerge "Deprecate acceptRingingCall and endCall."
Tyler Gunn [Fri, 1 Feb 2019 19:36:13 +0000 (11:36 -0800)]
Merge "Deprecate acceptRingingCall and endCall."
am: 6e3a88a3e2

Change-Id: I12830995d5a6f14d5aabd30cc084e36b4d4b740c

5 years agoMerge "Fix the wrong assignment"
Kyeongkab.Nam [Fri, 1 Feb 2019 19:27:57 +0000 (11:27 -0800)]
Merge "Fix the wrong assignment"
am: cf74daba15

Change-Id: I1ddab12828584676054e57d317600797564b0921

5 years agoMerge "[viewcompiler] Support more than 16 registers in invoke instructions"
Treehugger Robot [Fri, 1 Feb 2019 18:57:18 +0000 (18:57 +0000)]
Merge "[viewcompiler] Support more than 16 registers in invoke instructions"

5 years agoMerge "Refresh cardId before using it."
Jordan Liu [Fri, 1 Feb 2019 18:23:26 +0000 (18:23 +0000)]
Merge "Refresh cardId before using it."

5 years agoMerge "Deprecate acceptRingingCall and endCall."
Tyler Gunn [Fri, 1 Feb 2019 17:27:58 +0000 (17:27 +0000)]
Merge "Deprecate acceptRingingCall and endCall."

5 years agoMerge "Fix the wrong assignment"
Treehugger Robot [Fri, 1 Feb 2019 16:44:36 +0000 (16:44 +0000)]
Merge "Fix the wrong assignment"

5 years agoMerge "Add owners for KeyChain code" am: 0f9319ed1b
Eran Messeri [Fri, 1 Feb 2019 13:12:47 +0000 (05:12 -0800)]
Merge "Add owners for KeyChain code" am: 0f9319ed1b
am: d7fd57224d

Change-Id: I30f0d7060cb61a26efcddb5cd4e2119907a4f63e

5 years agoMerge "Add owners for KeyChain code"
Eran Messeri [Fri, 1 Feb 2019 13:03:21 +0000 (05:03 -0800)]
Merge "Add owners for KeyChain code"
am: 0f9319ed1b

Change-Id: Id8528c3b1c499cdab621479d27e52969f22ac22f

5 years agoMerge "Add owners for KeyChain code"
Eran Messeri [Fri, 1 Feb 2019 12:51:51 +0000 (12:51 +0000)]
Merge "Add owners for KeyChain code"

5 years agoMerge "Fix to register the receiver for all users" am: c72866785a
Kyeongkab.Nam [Fri, 1 Feb 2019 08:34:55 +0000 (00:34 -0800)]
Merge "Fix to register the receiver for all users" am: c72866785a
am: 29a43554ab

Change-Id: I6210f0c4a8705752a4597a04cf45f5f5709e0c9f

5 years agoMerge "Fix to register the receiver for all users"
Kyeongkab.Nam [Fri, 1 Feb 2019 08:26:38 +0000 (00:26 -0800)]
Merge "Fix to register the receiver for all users"
am: c72866785a

Change-Id: I931c857ad5c205df9cd244af6828d1d3abbd2afa

5 years agoFix the wrong assignment
Kyeongkab.Nam [Fri, 1 Feb 2019 02:51:02 +0000 (11:51 +0900)]
Fix the wrong assignment

the format value is erroneously assigned to sinkChannelMask.
Therefore, it modify to assign the format value to sinkFormat.

Test: manual
Change-Id: Iaa2f2cef0f1448a432279483b23e0057ae3ed381

5 years agoMerge "Fix to register the receiver for all users"
Treehugger Robot [Fri, 1 Feb 2019 08:08:32 +0000 (08:08 +0000)]
Merge "Fix to register the receiver for all users"

5 years agoMerge "Handle permission check for multi-active SIMs devices." am: 2638587995
Holly Jiuyu Sun [Fri, 1 Feb 2019 04:43:46 +0000 (20:43 -0800)]
Merge "Handle permission check for multi-active SIMs devices." am: 2638587995
am: 44eb96b47c

Change-Id: Ied8f6ef53a701547f4c921e3b401838c5facf205

5 years agoMerge "Handle permission check for multi-active SIMs devices."
Holly Jiuyu Sun [Fri, 1 Feb 2019 04:34:20 +0000 (20:34 -0800)]
Merge "Handle permission check for multi-active SIMs devices."
am: 2638587995

Change-Id: Ibc492399e3b083fe1781eae706ea00416e48429e

5 years agoMerge "Handle permission check for multi-active SIMs devices."
Holly Jiuyu Sun [Fri, 1 Feb 2019 04:16:50 +0000 (04:16 +0000)]
Merge "Handle permission check for multi-active SIMs devices."

5 years agoMerge "[viewcompiler] Add PrecompiledLayoutTest to TEST_MAPPING" am: 1cb64c6a85
Eric Holk [Fri, 1 Feb 2019 03:17:13 +0000 (19:17 -0800)]
Merge "[viewcompiler] Add PrecompiledLayoutTest to TEST_MAPPING" am: 1cb64c6a85
am: d8ec417dd6

Change-Id: I12273695d8318900d325436ebb252b287517c367

5 years agoMerge "[viewcompiler] Add PrecompiledLayoutTest to TEST_MAPPING"
Eric Holk [Fri, 1 Feb 2019 03:06:56 +0000 (19:06 -0800)]
Merge "[viewcompiler] Add PrecompiledLayoutTest to TEST_MAPPING"
am: 1cb64c6a85

Change-Id: I881a6acd8b68be987ceadf1dfc303aedb53a211a

5 years agoMerge "[viewcompiler] Add PrecompiledLayoutTest to TEST_MAPPING"
Treehugger Robot [Fri, 1 Feb 2019 02:50:31 +0000 (02:50 +0000)]
Merge "[viewcompiler] Add PrecompiledLayoutTest to TEST_MAPPING"

5 years agoMerge "Fix read/write parcel of CallAttributes" am: ed3af9f960
Jordan Liu [Fri, 1 Feb 2019 01:47:54 +0000 (17:47 -0800)]
Merge "Fix read/write parcel of CallAttributes" am: ed3af9f960
am: f5e381d4b6

Change-Id: Ib316593d772ca2305d70a61df49b7e0e8f5eacf8

5 years agoMerge "Fix read/write parcel of CallAttributes"
Jordan Liu [Fri, 1 Feb 2019 01:39:31 +0000 (17:39 -0800)]
Merge "Fix read/write parcel of CallAttributes"
am: ed3af9f960

Change-Id: I8706e6e4364e70728c124af6ed44780996e6faf5

5 years agoImprove AsyncTask API documentation
Hans Boehm [Fri, 1 Feb 2019 01:22:55 +0000 (17:22 -0800)]
Improve AsyncTask API documentation

Bug: 34278255
Test: TreeHugger
Change-Id: I0347072112254f98d257a72ef1fc7c21b086df39

5 years agoAdd signal strength converter
Pengquan Meng [Fri, 1 Feb 2019 00:29:43 +0000 (16:29 -0800)]
Add signal strength converter

This add a converter for SignalStrength response and indication.

Bug: 123532650
Test: build & current test
Change-Id: Id4cf874f6cc1798c732d6afb4a22f4d6bc4047fd

5 years agoMerge "Fix read/write parcel of CallAttributes"
Jordan Liu [Fri, 1 Feb 2019 01:20:53 +0000 (01:20 +0000)]
Merge "Fix read/write parcel of CallAttributes"

5 years agoFix wrong userData length and excessive userData issues
Taesu Lee [Thu, 31 Jan 2019 05:38:56 +0000 (14:38 +0900)]
Fix wrong userData length and excessive userData issues

Added checking size excess in encodeUCS2() and an exception cause in
EncodeException to distinguish between unencodable char and size excess.
It will prevent wrong userData length and excessive userData issues
during encoding userData. Please see below one issue scenario.

stringToGsm7BitPackedWithHeader() throws an EncodeException when
septeCount > 255. The EncodeException is caught and encoding again
through encodeUCS2(). However, the length of encoded userData as UCS-2
is converted as Byte without checking size excess. Thus first byte of
userData will be wrong and total userData will exceed maximum User Data.

Test: Manual

Change-Id: Ib6df5484072d77548e8adcbcbd15ad7a401c99f8
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
5 years agoMerge "Add new ImsException to better handle ImsService errors" am: 3811aba3a4
Brad Ebinger [Thu, 31 Jan 2019 23:43:52 +0000 (15:43 -0800)]
Merge "Add new ImsException to better handle ImsService errors" am: 3811aba3a4
am: 0bfbfe5646

Change-Id: Ic3a0806cc5e1d6efb0c2d175fda77cd57466072a

5 years agoMerge "Add new ImsException to better handle ImsService errors"
Brad Ebinger [Thu, 31 Jan 2019 23:34:13 +0000 (15:34 -0800)]
Merge "Add new ImsException to better handle ImsService errors"
am: 3811aba3a4

Change-Id: I006528d4295339a1d06a2f93f3000fbe1b279e73

5 years agoMerge "Add new ImsException to better handle ImsService errors"
Brad Ebinger [Thu, 31 Jan 2019 23:26:57 +0000 (23:26 +0000)]
Merge "Add new ImsException to better handle ImsService errors"

5 years ago[viewcompiler] Support more than 16 registers in invoke instructions
Eric Holk [Tue, 29 Jan 2019 16:32:42 +0000 (08:32 -0800)]
[viewcompiler] Support more than 16 registers in invoke instructions

This was causing the viewcompiler to crash on deeper layout hierarchies.

We fix this by reserving several scratch registers. When an invoke instruction
uses registers that don't fit in a 4-bit field, we move all of these values into
the scratch registers and use an invoke/range instruction instead. The scratch
registers are all above the highest allocated register, so they are guaranteed
not to clobber meaningful values.

Supporting more registers for invoke also required supporting
register-to-register moves, which some how we'd gotten by without so far.

Finally, to make viewcompiler fail more loudly when things go wrong, many
DCHECKs have been changed to CHECKs.

Bug: 123517491
Test: atest
Change-Id: I9eb7c9bcf1fc7d713e664b331804bdcddafc95a4

5 years agoRefresh cardId before using it.
Holly Jiuyu Sun [Wed, 30 Jan 2019 23:25:24 +0000 (15:25 -0800)]
Refresh cardId before using it.

Bug: 122978614
Bug: 111614811
Test: on phone
Change-Id: I30d70b839f05183ad201a114ea12c79c730f4206
Merged-In: I30d70b839f05183ad201a114ea12c79c730f4206

5 years agoMerge "Update android.hidl.manager-V1.0-java to V1.2" am: b9e216c2b6
Peter Kalauskas [Thu, 31 Jan 2019 22:30:22 +0000 (14:30 -0800)]
Merge "Update android.hidl.manager-V1.0-java to V1.2" am: b9e216c2b6
am: e20b0fb677

Change-Id: I19d522d2ea25549f92de9494f4e60b4af2ebe34b

5 years agoMerge "Update android.hidl.manager-V1.0-java to V1.2"
Peter Kalauskas [Thu, 31 Jan 2019 22:19:35 +0000 (14:19 -0800)]
Merge "Update android.hidl.manager-V1.0-java to V1.2"
am: b9e216c2b6

Change-Id: Ic66313072193f54835cc6aa0be7f6b98367f52ee

5 years agoMerge "Update android.hidl.manager-V1.0-java to V1.2"
Peter Kalauskas [Thu, 31 Jan 2019 22:05:47 +0000 (22:05 +0000)]
Merge "Update android.hidl.manager-V1.0-java to V1.2"

5 years agoUpdate android.hidl.manager-V1.0-java to V1.2
Peter Kalauskas [Tue, 22 Jan 2019 23:41:59 +0000 (15:41 -0800)]
Update android.hidl.manager-V1.0-java to V1.2

Test: Manual
Bug: 123307146
Change-Id: I8dcd291c187af2cb20fd9a8f09bd55e75a2762e1

5 years ago[viewcompiler] Add PrecompiledLayoutTest to TEST_MAPPING
Eric Holk [Mon, 28 Jan 2019 23:16:52 +0000 (15:16 -0800)]
[viewcompiler] Add PrecompiledLayoutTest to TEST_MAPPING

PrecompiledLayoutTest makes sure that layouts generated by the viewcompiler are
equivalent to inflating from the resource XML file. We'll want to run these
tests when making changes to the viewcompiler.

Bug: 111895153
Test: atest
Change-Id: Iffa6f0f01c3f43d43feaabd1a5cd36be76650975

5 years agoFix read/write parcel of CallAttributes
Jordan Liu [Wed, 30 Jan 2019 23:35:44 +0000 (15:35 -0800)]
Fix read/write parcel of CallAttributes

Fixes: 123363462
Test: manual
Change-Id: I947005d43930ad136e5d6933c950d0f27f8fbadd

5 years agoMerge "Do not generate greylist if UNSAFE_DISABLE_HIDDENAPI_FLAGS=true" am: f9ec508556
Adrian Roos [Thu, 31 Jan 2019 19:56:04 +0000 (11:56 -0800)]
Merge "Do not generate greylist if UNSAFE_DISABLE_HIDDENAPI_FLAGS=true" am: f9ec508556
am: 942dedc59c

Change-Id: I17dc3064c3205ac16a92553f59947e12a7d51b77

5 years agoMerge "Do not generate greylist if UNSAFE_DISABLE_HIDDENAPI_FLAGS=true"
Adrian Roos [Thu, 31 Jan 2019 19:42:50 +0000 (11:42 -0800)]
Merge "Do not generate greylist if UNSAFE_DISABLE_HIDDENAPI_FLAGS=true"
am: f9ec508556

Change-Id: I459e7bb01b0b72c792b8af621331a2e43718fc9e

5 years agoMerge "Do not generate greylist if UNSAFE_DISABLE_HIDDENAPI_FLAGS=true"
Treehugger Robot [Thu, 31 Jan 2019 19:25:59 +0000 (19:25 +0000)]
Merge "Do not generate greylist if UNSAFE_DISABLE_HIDDENAPI_FLAGS=true"

5 years agoDeprecate acceptRingingCall and endCall.
Tyler Gunn [Thu, 31 Jan 2019 18:54:03 +0000 (10:54 -0800)]
Deprecate acceptRingingCall and endCall.

These APIs are replaced by CallScreeningService and the new
companion app roles in InCallService.

Test: Update Apis and verify deprecated.
Bug: 63966743
Change-Id: Ib4c4ac6b723ccd46d3052fb2b9c9f58b3151cc29

5 years agoMerge "Compile CaptivePortalLogin as system_current" am: a5a7af11d7
Remi NGUYEN VAN [Thu, 31 Jan 2019 15:28:41 +0000 (07:28 -0800)]
Merge "Compile CaptivePortalLogin as system_current" am: a5a7af11d7
am: 2891385ae3

Change-Id: Ia87b8a20fed2cc1c09b15a27ed35be2c2a964b61

5 years agoMerge "Add the DynamicAndroid Service" am: 0b2057db02
Howard Chen [Thu, 31 Jan 2019 15:11:33 +0000 (07:11 -0800)]
Merge "Add the DynamicAndroid Service" am: 0b2057db02
am: 683251a1e2

Change-Id: Ia23e042273c8ab1a9d6de5e393b126794822cb5f

5 years agoMerge "Compile CaptivePortalLogin as system_current"
Remi NGUYEN VAN [Thu, 31 Jan 2019 15:11:28 +0000 (07:11 -0800)]
Merge "Compile CaptivePortalLogin as system_current"
am: a5a7af11d7

Change-Id: Ib2675171c491228bf01105919a1167b7996cb2e7

5 years agoMerge "Compile CaptivePortalLogin as system_current"
Remi NGUYEN VAN [Thu, 31 Jan 2019 15:01:49 +0000 (15:01 +0000)]
Merge "Compile CaptivePortalLogin as system_current"

5 years agoMerge "Add the DynamicAndroid Service"
Howard Chen [Thu, 31 Jan 2019 14:52:18 +0000 (06:52 -0800)]
Merge "Add the DynamicAndroid Service"
am: 0b2057db02

Change-Id: I468b528359f3f4cafe735f2bc9df08b755e66190

5 years agoMerge "Add NetworkStackPermissionStub definitions" am: 0fe59007ce
Remi NGUYEN VAN [Thu, 31 Jan 2019 14:36:24 +0000 (06:36 -0800)]
Merge "Add NetworkStackPermissionStub definitions" am: 0fe59007ce
am: d1a7c18ec6

Change-Id: I201c5a28b7f07178a6980e582d05b36121037707

5 years agoMerge "Add the DynamicAndroid Service"
Howard Chen [Thu, 31 Jan 2019 14:35:49 +0000 (14:35 +0000)]
Merge "Add the DynamicAndroid Service"

5 years agoMerge "Add NetworkStackPermissionStub definitions"
Remi NGUYEN VAN [Thu, 31 Jan 2019 14:29:22 +0000 (06:29 -0800)]
Merge "Add NetworkStackPermissionStub definitions"
am: 0fe59007ce

Change-Id: I0cd613b09160f7a8f223bd2ec5ab29a85c219f66

5 years agoMerge "Add NetworkStackPermissionStub definitions"
Remi NGUYEN VAN [Thu, 31 Jan 2019 14:13:22 +0000 (14:13 +0000)]
Merge "Add NetworkStackPermissionStub definitions"

5 years agoMerge "Prepare CaptivePortalLogin for system_current" am: 74b1c8626e
Remi NGUYEN VAN [Thu, 31 Jan 2019 13:06:04 +0000 (05:06 -0800)]
Merge "Prepare CaptivePortalLogin for system_current" am: 74b1c8626e
am: 9b29d62990

Change-Id: Id953d39b834fbe72137fcd7ee3b4aacc92266dbd

5 years agoMerge "Prepare CaptivePortalLogin for system_current"
Remi NGUYEN VAN [Thu, 31 Jan 2019 12:56:51 +0000 (04:56 -0800)]
Merge "Prepare CaptivePortalLogin for system_current"
am: 74b1c8626e

Change-Id: I94b2c465290c36a601de89f6c9e8ebd138b2efe7

5 years agoMerge "Prepare CaptivePortalLogin for system_current"
Remi NGUYEN VAN [Thu, 31 Jan 2019 12:46:00 +0000 (12:46 +0000)]
Merge "Prepare CaptivePortalLogin for system_current"

5 years agoMerge "Fix bluetooth tethering on multi-user" am: 4bb4c1a792
Remi NGUYEN VAN [Thu, 31 Jan 2019 12:20:50 +0000 (04:20 -0800)]
Merge "Fix bluetooth tethering on multi-user" am: 4bb4c1a792
am: 1a0ac241e8

Change-Id: I73c2a061f2aeae466f650d85f16cb4587b264737

5 years agoAdd NetworkStackPermissionStub definitions
Remi NGUYEN VAN [Wed, 30 Jan 2019 12:45:56 +0000 (21:45 +0900)]
Add NetworkStackPermissionStub definitions

The NetworkStackPermissionStub package is used to enforce that
permissions used by the NetworkStack are only used in packages
sharing signature with NetworkStackPermissionStub.

Permissions defined in this package are intended to be used only by the
NetworkStack: both NetworkStack and the stub APK will be signed with
a dedicated certificate to ensure that, with permissions being signature
permissions.

This APK *must* be installed, even if the NetworkStack app is not
installed, because otherwise, any application will be able to define
this permission and the system will give that application full access
to the network stack.

Test: flashed, booted
Bug: 112869080
Change-Id: Ia13a9e6a703cb7b4403697a7f7bfff0f6f3b813e

5 years agoMerge "Fix bluetooth tethering on multi-user"
Remi NGUYEN VAN [Thu, 31 Jan 2019 12:09:29 +0000 (04:09 -0800)]
Merge "Fix bluetooth tethering on multi-user"
am: 4bb4c1a792

Change-Id: I24be143b38bdda59b4cc3037e495f0cb268a2b9f

5 years agoMerge "Fix bluetooth tethering on multi-user"
Remi NGUYEN VAN [Thu, 31 Jan 2019 11:53:53 +0000 (11:53 +0000)]
Merge "Fix bluetooth tethering on multi-user"

5 years agoAdd owners for KeyChain code
Eran Messeri [Thu, 31 Jan 2019 11:48:40 +0000 (11:48 +0000)]
Add owners for KeyChain code

Add the Android Enterprise Security team as OWNERS for KeyChain and
KeyChain-related code.

The KeyChain code currently lives under keystore/, which means every
change requires Keystore owners approval, but it does not make sense for
KeyChain as KeyChain is a Keystore client and is developed
independently.

Test: Gerritt upload.
Bug: 33166666
Change-Id: Idfedda9553add303439179ce10a1e75e437bbe83

5 years agoCompile CaptivePortalLogin as system_current
Remi NGUYEN VAN [Wed, 30 Jan 2019 15:16:27 +0000 (00:16 +0900)]
Compile CaptivePortalLogin as system_current

Test: make CaptivePortalLogin
Test: flashed, boots, login works
Bug: 112869080
Change-Id: I955c1b111ce76262fe20f5891b1853de0889f4b8

5 years agoPrepare CaptivePortalLogin for system_current
Remi NGUYEN VAN [Wed, 30 Jan 2019 14:39:24 +0000 (23:39 +0900)]
Prepare CaptivePortalLogin for system_current

Includes small changes to stop using non-SystemApi endpoints.

Test: make CaptivePortalLogin
Test: flashed, login works, SSL certificate invalid flow works
Bug: 112869080
Merged-In: Ic6ce98942959705ea7ef14a7a62d33e3abf7eb72
Change-Id: Ie7ea3bab6aa8629ce4c111adee0c0699d95d4b0e

5 years agoAdd NR to preferred network type combination
chen xu [Thu, 31 Jan 2019 08:44:52 +0000 (00:44 -0800)]
Add NR to preferred network type combination

This add NR 5G to preferred network type and move preferredNetworkMode
from SystemApi to hidden api as we are not going to support
preferredNetworMode enum in the future.

Bug: 111453000
Test: build
Change-Id: I08a8f7bf44a62ef109583b82b22f65fd6f89c71d
(cherry picked from commit 8bcdc4cf66e9d654fa31d7c62654ff81ee04cdc6)
Merged-in: I08a8f7bf44a62ef109583b82b22f65fd6f89c71d

5 years agoMerge changes from topic "bindprocess-resolv" am: 643e60b0fe
Remi NGUYEN VAN [Thu, 31 Jan 2019 08:19:37 +0000 (00:19 -0800)]
Merge changes from topic "bindprocess-resolv" am: 643e60b0fe
am: 291e3726cd

Change-Id: I80f85170981c2f5b1ef949b5db88baf5fc101cd0

5 years agoMerge changes from topic "bindprocess-resolv"
Remi NGUYEN VAN [Thu, 31 Jan 2019 08:11:25 +0000 (00:11 -0800)]
Merge changes from topic "bindprocess-resolv"
am: 643e60b0fe

Change-Id: I3aacc6c2ae5242e28eec6e9e8e2a9a4b3e4f715d

5 years agoMerge changes from topic "bindprocess-resolv"
Remi NGUYEN VAN [Thu, 31 Jan 2019 07:52:04 +0000 (07:52 +0000)]
Merge changes from topic "bindprocess-resolv"

* changes:
  Allow use of bindProcessToNetwork only to change private DNS bypass.
  Allow bypassing private DNS via bindProcessToNetwork.

5 years agoMerge "Add get last entitlement value callback API" am: 4163ff7928
Mark Chien [Thu, 31 Jan 2019 07:49:43 +0000 (23:49 -0800)]
Merge "Add get last entitlement value callback API" am: 4163ff7928
am: 524fbd619e

Change-Id: I42892bdacaa41f9cea7e653f0bb9b5497192e5f6

5 years agoMerge "Add get last entitlement value callback API"
Mark Chien [Thu, 31 Jan 2019 07:35:15 +0000 (23:35 -0800)]
Merge "Add get last entitlement value callback API"
am: 4163ff7928

Change-Id: I1961297c3fa31f5575ae3a11a3fc90d695cb7de5

5 years agoMerge "Add get last entitlement value callback API"
Mark Chien [Thu, 31 Jan 2019 07:23:31 +0000 (07:23 +0000)]
Merge "Add get last entitlement value callback API"

5 years agoAdd the DynamicAndroid Service
Howard Chen [Mon, 7 Jan 2019 06:10:44 +0000 (14:10 +0800)]
Add the DynamicAndroid Service

  Define the DynamicAndroid with AIDL.
  Add a java implementation.
  Start a service instance in the system server.
  Add a permission test.

Bug: 122015653
Test: Build & Test on a pixel phone with following command \
  ./frameworks/base/services/tests/runtests.py -e class com.android.server.DynamicAndroidTest

Merged-In: I2e54b6b71fac4a4c5a9c9c25ce6bdac74cddcfb7
Change-Id: I2e54b6b71fac4a4c5a9c9c25ce6bdac74cddcfb7

5 years agoFix bluetooth tethering on multi-user
Remi NGUYEN VAN [Wed, 30 Jan 2019 23:46:36 +0000 (08:46 +0900)]
Fix bluetooth tethering on multi-user

Bluetooth runs as UID 1001002 when on a secondary user. With this change
the NetworkStack verifies that the calling UID matches the Bluetooth app
regardless of the user.

Test: flashed, BT reverse tethering still working as primary user
      (no option to turn on as secondary user on phones)
Bug: 123655057
Change-Id: I23f9c5fa40f3bb676ac65dd8c15106c9d78309a4

5 years agoMerge "Add UserHandle.getAppId to SystemApi" am: b334bbefd4
Remi NGUYEN VAN [Thu, 31 Jan 2019 06:29:31 +0000 (22:29 -0800)]
Merge "Add UserHandle.getAppId to SystemApi" am: b334bbefd4
am: dac257d27c

Change-Id: If35e251dbbbca2839529bbb999c6813fb601d1c0

5 years agoMerge "Add UserHandle.getAppId to SystemApi"
Remi NGUYEN VAN [Thu, 31 Jan 2019 06:17:58 +0000 (22:17 -0800)]
Merge "Add UserHandle.getAppId to SystemApi"
am: b334bbefd4

Change-Id: I6be04cb335e642921d67a68970078c2cae4af4e7