Commit Graph

21158 Commits

Author SHA1 Message Date
Courtney Goeltzenleuchter
42bce33475 Merge "Update to EGL 1.5" 2018-10-18 23:33:45 +00:00
Brad Ebinger
dfe87a6d16 Merge "Expose ImsExternalCallState constructor as @SystemApi" am: 4133a00a10 am: 8e5a756f9d
am: aa2e73d8a5

Change-Id: I12e15589ed079a100efd3a872eb60193951b4efa
2018-10-18 15:39:04 -07:00
Brad Ebinger
aa2e73d8a5 Merge "Expose ImsExternalCallState constructor as @SystemApi" am: 4133a00a10
am: 8e5a756f9d

Change-Id: Icc899e3da0472a9409856e51d1bd8f02074431ad
2018-10-18 15:24:51 -07:00
Shuo Qian
fc6a54b841 Merge "Fix current.txt error" 2018-10-18 21:45:06 +00:00
TreeHugger Robot
dc315fd243 Merge "WebView: add new integer for billing threats" 2018-10-18 19:50:08 +00:00
sqian
b687978e15 Fix current.txt error
Bug: 113072551
Test: compile
Change-Id: I00720bc3f947adf3c1072c75a040e85333d317f5
2018-10-18 11:49:09 -07:00
Shuo Qian
12a2b2ec6d Merge "Compare Emergency number display priority" am: a9d551ca7b am: 1f36225eaf
am: 8b1a350056

Change-Id: I3b84be0f8beba2d9108eeb4d43f4c633b837e368
2018-10-18 09:55:24 -07:00
Brad Ebinger
4133a00a10 Merge "Expose ImsExternalCallState constructor as @SystemApi" 2018-10-18 16:54:38 +00:00
Shuo Qian
8b1a350056 Merge "Compare Emergency number display priority" am: a9d551ca7b
am: 1f36225eaf

Change-Id: Ie177f4fda621f5415f236bae305731ebcf7c34fe
2018-10-18 08:39:48 -07:00
Jack Yu
e4eab61e1a Merge "Supported v1.3 data profile" am: 1e4f6fbe23 am: 405ea01c54
am: 7413496e2c

Change-Id: Ibc6299f8b5a03e2f7228f462486342fed00ed67c
2018-10-18 08:33:01 -07:00
Jack Yu
7413496e2c Merge "Supported v1.3 data profile" am: 1e4f6fbe23
am: 405ea01c54

Change-Id: Ia6737beb1fda5a01159a9ed52e5e26976744b9ab
2018-10-18 07:52:24 -07:00
Roland Levillain
9426e28727 resolve merge conflicts of acbcff9e7d to pi-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Bug: 117349311
Change-Id: I1d07e5d6e749bd96cf322dd77422d6401233f081
2018-10-18 14:18:17 +01:00
Nate Fischer
f9a235316c WebView: add new integer for billing threats
No change to logic, this adds a new integer constant for Safe Browsing
billing threats.

This also adds ending periods in the docs for existing threat types.

Bug: 117470538
Test: N/A
Change-Id: I5368601efc7d587af1f530b7bf2825f277424082
2018-10-17 20:30:54 -07:00
Chen Xu
535b74527d Merge "Revert "Revert "refactor radioPowerstate""" 2018-10-17 22:45:38 +00:00
Chen Xu
7395c630b0 Revert "Revert "refactor radioPowerstate""
This reverts commit 05188f3555.

Reason for revert: <INSERT REASONING HERE>

Change-Id: Id170063bfdb1e3325f67e8680231ab4deda7d65d

Bug: 117349311
2018-10-17 22:45:21 +00:00
Shuo Qian
a9d551ca7b Merge "Compare Emergency number display priority" 2018-10-17 22:12:02 +00:00
Dongwon Kang
edf4d2275d Merge "Add RingtoneManager.openDefaultRingtoneUri()" 2018-10-17 17:40:33 +00:00
Brad Ebinger
9a6c675da2 Expose ImsExternalCallState constructor as @SystemApi
1) Expose the ImsExternalCallState constructor as @SystemApi
so that vendors can use this class correctly.
2) Change the call ID from int->String to comply with RFC 4235.

Bug: 117555643
Bug: 115697579
Test: Manual
Change-Id: I980ec091c69d2b3179843bd8485955377b88712e
2018-10-17 10:18:47 -07:00
Eran Messeri
5cb1e8e636 Merge "Enterprise Policy for Private DNS Setting" 2018-10-17 16:59:57 +00:00
Jack Yu
1e4f6fbe23 Merge "Supported v1.3 data profile" 2018-10-17 15:56:41 +00:00
Przemyslaw Szczepaniak
7072da44cc Merge "Revert "refactor radioPowerstate"" 2018-10-17 11:04:14 +00:00
Przemyslaw Szczepaniak
05188f3555 Revert "refactor radioPowerstate"
This reverts commit 700c8a0389.

Reason for revert: Broken master build

Change-Id: Ia0171ff9250228cc03685e7f03da8dd9e374826f
2018-10-17 11:00:01 +00:00
TreeHugger Robot
11f07dec94 Merge "Private DNS: Add user restriction" 2018-10-17 08:36:56 +00:00
Chen Xu
354fc35005 Merge "refactor radioPowerstate" 2018-10-17 04:10:47 +00:00
Shuo Qian
59c8b87ad4 Merge "Make SubscriptionManager.getSlotIndex public" am: 719310cd2c
am: a781751b32

Change-Id: Ib7d3dd0f7ce06edf736c493cde6778365c366ae2
2018-10-16 18:06:09 -07:00
TreeHugger Robot
38d0bd0634 Merge "Set EXTRA_USER instead of EXTRA_USER_ID for ACTION_SHOW_ADMIN_SUPPORT_DETAILS" 2018-10-17 00:26:37 +00:00
TreeHugger Robot
0569538675 Merge "Clean-up removed RecoveryController API" 2018-10-17 00:22:02 +00:00
Chen Xu
a7274eb9b2 Merge "refactor radioPowerstate" 2018-10-17 00:14:45 +00:00
TreeHugger Robot
ce5c43379f Merge "Make SubscriptionManager.getSlotIndex public" 2018-10-16 23:07:29 +00:00
sqian
5660149817 Compare Emergency number display priority
Define the rules for emergency numbers that may have higher display
priority, and make Emergency number comparable for these values. This
is also essential for sorting the list so that an emergency number with
higher display priority should be listed in a lower index.

Test: Treehugger, unit test
Bug: 112657134
Change-Id: I46fb009ce862ec3c593a05b4b04e180faf198fc4
2018-10-16 14:44:53 -07:00
Jack Yu
72e3077715 Supported v1.3 data profile
1. Supported IRadio v1.3 data profile.
2. Do not send data profile list when the list is empty.
3. Only set profile id when the data profile must persist on the
   modem.

Test: Manual and unit tests
Bug: 73659459

Change-Id: I1414b5346cec1d617f7093c3761dbd77fe594a8b
2018-10-16 14:21:58 -07:00
chen xu
700c8a0389 refactor radioPowerstate
1. new System API for getRadioPowerState with permision check
2. new System API for onRadioPowerStateChanged in PhoneStateListener
3. replace radioState enum in CommandsInterface to telephonyMgr defined
int.

Bug: 117349311
Test: telephony unit test
Change-Id: I502568280fbf9213ca6bf1f7fb204d0d4ce86580
2018-10-16 20:33:28 +00:00
Courtney Goeltzenleuchter
367ed8b190 Update to EGL 1.5
Test: compile
Bug: 80239516
Change-Id: I1c00ac5e55900260b724e1c298edca15f87f3a01
(cherry picked from commit 63584195b9d15daa9973d280381fd619cd7a0f89)
2018-10-16 14:10:20 -06:00
TreeHugger Robot
e9944aa1dc Merge "Make loadSafeLabel a generic facility as makeSafeForPresentation" 2018-10-16 16:21:10 +00:00
Haoyu Zhang
36252bf2bf Merge "Add default implementation for LineBackgroundSpan" 2018-10-16 00:31:40 +00:00
chen xu
760729c33e refactor radioPowerstate
1. new System API for getRadioPowerState with permision check
2. new System API for onRadioPowerStateChanged in PhoneStateListener
3. replace radioState enum in CommandsInterface to telephonyMgr defined
int.

Bug: 117349311
Test: telephony unit test
Change-Id: I502568280fbf9213ca6bf1f7fb204d0d4ce86580
Merged-in: I502568280fbf9213ca6bf1f7fb204d0d4ce86580
2018-10-15 16:56:04 -07:00
Seigo Nonaka
aa35899430 Merge "Make LineBreaker public" 2018-10-15 21:56:12 +00:00
TreeHugger Robot
bc9ebba7e5 Merge "Suspending app can customize intercepting dialog" 2018-10-15 21:51:52 +00:00
sqian
996a318e8d Make SubscriptionManager.getSlotIndex public
- Make public
- Improved the documentation
- Rename subId to subscriptionId
- Make INVALID_SIM_SLOT_INDEX public

Test: Treehugger
Bug: 113072551
Change-Id: I61376966868f62db841ffd1b9c8ac045054e2207
Merged-In: I61376966868f62db841ffd1b9c8ac045054e2207
2018-10-15 17:30:22 +00:00
Philip P. Moltmann
125f042c05 Merge "Rename recently added symbols to camel-case" 2018-10-15 17:16:55 +00:00
Philip P. Moltmann
54118289e5 Merge "Use public method in RestrictedLockUtils#isCurrentUserOrProfile" 2018-10-15 16:41:53 +00:00
Philip P. Moltmann
3e0f1b46e4 Merge "Rename system-api wm flags to SYSTEM_..." 2018-10-15 16:28:39 +00:00
Philip P. Moltmann
c1fda744f0 Make loadSafeLabel a generic facility as makeSafeForPresentation
Any app loading untrusted strings should make the strings face. Hence make
the method publicly available.

Test: atest CtsTextTestCases:MakeSafeForPresentationTest GtsContentTestCases:PackageItemInfoTests
Change-Id: Ib0679fe892181535339dac77583c427e0d64dd05
Fixes: 113856697
2018-10-15 09:11:52 -07:00
Zimuzo Ezeozue
b5e29698d7 Merge "Add physical activity recognition permission and group" 2018-10-15 11:02:50 +00:00
Eran Messeri
a2e0ca77a8 Enterprise Policy for Private DNS Setting
A new API for setting the Private DNS settings value programatically via
the DevicePolicyManager.

Since there are two separate settings for Private DNS, and the value
provided for the hostname needs to be validated, a new
DevicePolicyManager API is introduced.

Only a Device Policy Client in Device Owner mode may change these
settings.
The DPC may additionally set a user restriction (added in a separate CL)
to prevent the user from changing Private DNS settings.

Bug: 112982691
Test: atest com.android.cts.devicepolicy.DeviceOwnerTest#testPrivateDnsPolicy
Change-Id: I566437e4fe10e1346858149120c50b3c20ca073f
2018-10-15 11:53:22 +01:00
Eran Messeri
09b122daac Private DNS: Add user restriction
Add a user restriction to prevent the user from changing the Private DNS
settings.

This would be used together with the new DevicePolicyManager API to set
the Private DNS settings by the Device Policy Client to enforce Private
DNS settings by the IT admin of the user.

Bug: 112982691
Test: atest com.android.cts.devicepolicy.DeviceOwnerTest#testPrivateDnsPolicy
Test: m -j RunSettingsRoboTests ROBOTEST_FILTER=PrivateDnsModeDialogPreferenceTest
Test: Manual, using TestDPC
Change-Id: Ibec3cfcede7e4082db4068cbdd047ada3f6c227e
2018-10-15 07:52:26 +01:00
sqian
e29d4a7f45 Make SubscriptionManager.getSlotIndex public
- Make public
- Improved the documentation
- Rename subId to subscriptionId
- Make INVALID_SIM_SLOT_INDEX public

Test: Treehugger
Bug: 113072551
Change-Id: I61376966868f62db841ffd1b9c8ac045054e2207
2018-10-12 20:51:22 -07:00
Philip P. Moltmann
add325328b Merge "Make PermissionManager use lists" 2018-10-12 23:43:11 +00:00
Suprabh Shukla
389cb6f54a Suspending app can customize intercepting dialog
The suspending app has more context about why a particular app was
suspended by the user, but we do not want to delegate the interception
of the suspended activity out of the system.
Hence allowing it further customizations to the dialog to make
it clearer.

Test: atest com.android.server.pm.SuspendDialogInfoTest \
com.android.server.pm.SuspendPackagesTest \
com.android.server.pm.PackageUserStateTest \
com.android.server.pm.PackageManagerSettingsTests \
com.android.server.am.ActivityStartInterceptorTest

atest GtsSuspendAppsPermissionTestCases GtsSuspendAppsTestCases

Bug: 112486945
Bug: 113150060
Change-Id: If9f4d14587a2b75bb572e7984a90e300a2c72d16
2018-10-12 16:02:53 -07:00
Chen Xu
2a670634e3 Merge "refactor data/voice roaming states" am: 6bd29ab2df am: 652ec06948
am: 6169b04385

Change-Id: I921e3dd8f4c82d83d1f12657813945fbcc2e21b2
2018-10-12 11:57:14 -07:00