Commit Graph

13208 Commits

Author SHA1 Message Date
Yueming Wang
a91c4ac73c Merge "Add javadoc to explain ApnSetting conflict." into pi-dev am: 3cc7c4fc76
am: 5148a2e55f

Change-Id: I98a93f4f9dad2f50c18b5a14c3500d8598368a33
2018-03-27 10:45:58 +00:00
Yueming Wang
5148a2e55f Merge "Add javadoc to explain ApnSetting conflict." into pi-dev
am: 3cc7c4fc76

Change-Id: I2370b8cc9b5b730d2bf2c4f522d955e952f74bdb
2018-03-27 10:30:37 +00:00
Yueming Wang
3cc7c4fc76 Merge "Add javadoc to explain ApnSetting conflict." into pi-dev 2018-03-27 10:19:13 +00:00
Eric Sandness
d6382ed1a1 Merge "Permission Check For DPM.getUserProvisioningState" into pi-dev am: 1ad8367249
am: 135b4fa15c

Change-Id: I927b602ff188ec92c155503fe2629364ddd7d49f
2018-03-27 10:09:51 +00:00
Eric Sandness
135b4fa15c Merge "Permission Check For DPM.getUserProvisioningState" into pi-dev
am: 1ad8367249

Change-Id: I8b33dcb4338ffa47c11d06f30e4d7b36f275fcd9
2018-03-27 10:03:32 +00:00
Eric Sandness
1ad8367249 Merge "Permission Check For DPM.getUserProvisioningState" into pi-dev 2018-03-27 09:52:58 +00:00
yuemingw
6586f05457 Add javadoc to explain ApnSetting conflict.
As per discussion with Amit, it's better to define "conflict"
of ApnSetting in DevicePolicyManager API javadoc.

Bug: 72153573
Test: not required.
Change-Id: I765dace36a3c9c491c988dc0a87479cdec620e37
2018-03-27 08:29:05 +00:00
Jason Monk
8cf36dca52 Merge "Security fixup for Slices" into pi-dev am: fc704e2fd7
am: fe54f0c260

Change-Id: I3630b6130f2e51fee1a76364c424a20728213251
2018-03-26 22:13:16 +00:00
Jason Monk
fe54f0c260 Merge "Security fixup for Slices" into pi-dev
am: fc704e2fd7

Change-Id: I7a3dfda74afdbaa1c77058b3a27c86899c1b05a3
2018-03-26 21:59:46 +00:00
Jason Monk
fc704e2fd7 Merge "Security fixup for Slices" into pi-dev 2018-03-26 21:44:38 +00:00
Benjamin Franz
cc8892f821 Merge "Expose hidden API to check whether a given package is state protected" into pi-dev am: 3ff20e2257
am: ea32bc4e38

Change-Id: I1b2cdac459c7c099783fa078eb2f009a645ba715
2018-03-26 09:42:05 +00:00
Benjamin Franz
ea32bc4e38 Merge "Expose hidden API to check whether a given package is state protected" into pi-dev
am: 3ff20e2257

Change-Id: I797fd24aff1afa3e37e6b5f4dbd93042b19ac369
2018-03-26 09:29:29 +00:00
Benjamin Franz
3ff20e2257 Merge "Expose hidden API to check whether a given package is state protected" into pi-dev 2018-03-26 09:15:41 +00:00
Suprabh Shukla
6c4decc9bb Merge "Guarding collisions in TimeSparseArray" into pi-dev am: 6da53af9c5
am: b334f1b2e9

Change-Id: I7e65cc4b1caa08b8303fd2c4db1fe7e0cf0b2481
2018-03-24 22:57:56 +00:00
Suprabh Shukla
b334f1b2e9 Merge "Guarding collisions in TimeSparseArray" into pi-dev
am: 6da53af9c5

Change-Id: Ic8ba83876a867fc57100b33b47cd8ef51be39dfe
2018-03-24 22:49:37 +00:00
TreeHugger Robot
6da53af9c5 Merge "Guarding collisions in TimeSparseArray" into pi-dev 2018-03-24 22:36:21 +00:00
Andrii Kulian
2b55287fe5 Merge "Revert "Use transaction for local activity relaunch"" into pi-dev am: 603b911e48
am: 7558a0b30c

Change-Id: Ic7c7b699f217e69ed6f6f852145fe276f4a8c49c
2018-03-24 05:25:18 +00:00
Wale Ogunwale
0cc85cd5f4 Merge "Merge "Don't show unsupported sdk warning in test harness." into pi-dev am: 444885b10d" into pi-dev-plus-aosp
am: cd6eae6cce

Change-Id: Id6e530efea409379ac882843824baaf3260cb264
2018-03-24 04:54:12 +00:00
Andrii Kulian
7558a0b30c Merge "Revert "Use transaction for local activity relaunch"" into pi-dev
am: 603b911e48

Change-Id: I9443d43e9758916eb2ec6721c1ca9992bd7b9d87
2018-03-24 01:44:46 +00:00
Wale Ogunwale
21315b15b7 Merge "Don't show unsupported sdk warning in test harness." into pi-dev
am: 444885b10d

Change-Id: I750ffef919badf38d759a32b1067702692d2a9c2
2018-03-24 01:21:39 +00:00
Suprabh Shukla
2811d92483 Guarding collisions in TimeSparseArray
TimeSparseArray - used to store UsageEvents - can keep at most one event
per millisecond, which can result in an event being replaced by another
event that occurred close enough that the system records it at the same
millisecond.

Test: atest android.app.usage.TimeSparseArrayTest

Fixes: 73832306
Change-Id: I860a101ab098f65d5c5832758832f43572865690
2018-03-23 17:51:20 -07:00
Andrii Kulian
603b911e48 Merge "Revert "Use transaction for local activity relaunch"" into pi-dev 2018-03-23 23:36:02 +00:00
Wale Ogunwale
444885b10d Merge "Don't show unsupported sdk warning in test harness." into pi-dev 2018-03-23 23:32:54 +00:00
Amith Yamasani
78f3b26d6c Merge "Merge "Provide app launch count in UsageStats" into pi-dev am: 8808edb063" into pi-dev-plus-aosp
am: b2312dc99b

Change-Id: Id475a570188d5109e3d77d77f47e77dc6376ff51
2018-03-23 21:32:26 +00:00
Amith Yamasani
980b453e17 Merge "Provide app launch count in UsageStats" into pi-dev
am: 8808edb063

Change-Id: I62a73e647fcbfffe5a56fe8229d8fb79738e2a80
2018-03-23 20:49:16 +00:00
Petr Cermak
048a8cd2d4 Merge "Annotate RemoteInput#SOURCE_* with @IntDef" into pi-dev am: 4341a66b03
am: fcca48b648

Change-Id: Id8880eb77a36a137756ed329469079d699aaf042
2018-03-23 19:17:06 +00:00
Amith Yamasani
8808edb063 Merge "Provide app launch count in UsageStats" into pi-dev 2018-03-23 19:13:22 +00:00
Jason Monk
ac11238291 Security fixup for Slices
- Allow slice providers to override grant flow
 - Remove overriding caller, that was a terrible idea
 - Move where the same app check happens to allow for CTS

Test: CTS
Bug: 69168488
Change-Id: I61c81c0665a08420b7bc83e3660657b62b2cd6a8
2018-03-23 15:08:11 -04:00
Eric Sandness
3780c09c76 Permission Check For DPM.getUserProvisioningState
Require the caller of DPM.getUserProvisioningState() to hold the
MANAGE_USERS permission.  All callers should be apps involved in device
provisioning, which already hold this permission.

Bug: 62343414
Test: Run Device Owner sync auth provisioning manually
Test: Set up work profile with managed account manually
Test: com.android.server.devicepolicy.DevicePolicyManagerTest
Test:
com.android.managedprovisioning.finalization.UserProvisioningStateHelperTest
Test: com.google.android.setupwizard.tests.activity.QrScanControllerTest
Change-Id: Ib85433586d4dfb89019ca223fb925aca3d4bbf67
2018-03-23 18:59:41 +00:00
Petr Cermak
fcca48b648 Merge "Annotate RemoteInput#SOURCE_* with @IntDef" into pi-dev
am: 4341a66b03

Change-Id: I0d1a41c52cfe2b24eaa23cbd8fc49a6ae6493c2f
2018-03-23 18:55:42 +00:00
Andrii Kulian
46312b3999 Revert "Use transaction for local activity relaunch"
This reverts commit 77d7360597.

Reason for revert: b/76088057

Bug: 72029061
Bug: 76088057
Change-Id: Ib1212740bcd5dd0fe8de87521e716c17b93c30cd
2018-03-23 18:33:35 +00:00
Petr Cermak
8e2731bfef Annotate RemoteInput#SOURCE_* with @IntDef
This patch addresses a request from the API Council (http://b/74409378).
It defines a new RemoteInput.Source annotation for RemoteInput source
constants.

Bug: 74409378
Test: atest RemoteInputTest
Change-Id: I78a006b6a600ea0c0603b2591d1a29596074a44e
2018-03-23 15:51:12 +00:00
Selim Cinek
3c8d7ba7ed Merge "Updated the styling for notifications" into pi-dev am: 51856fde2b
am: eabdcf3bef

Change-Id: Ic2a3454078e81ebd564549c1c3984fee6aef7c9d
2018-03-23 04:30:32 +00:00
Selim Cinek
eabdcf3bef Merge "Updated the styling for notifications" into pi-dev
am: 51856fde2b

Change-Id: I8d7b12955763d4d286119e976901fb55cb7a023e
2018-03-23 03:01:17 +00:00
Suprabh Shukla
075541707a Merge "APIs to suspend packages with SUSPEND_APPS permission" into pi-dev am: 6affc07065
am: 31b5990893

Change-Id: Ib95745ca26362a9624b704b217b4d9078d0ade7c
2018-03-23 01:17:09 +00:00
Suprabh Shukla
31b5990893 Merge "APIs to suspend packages with SUSPEND_APPS permission" into pi-dev
am: 6affc07065

Change-Id: Icd9ccea90cac3b367b74915f76d39d7f5f740687
2018-03-23 00:09:48 +00:00
TreeHugger Robot
51856fde2b Merge "Updated the styling for notifications" into pi-dev 2018-03-23 00:02:35 +00:00
Nathan Harold
c3eb60cec6 Merge "Add AppOp for IpSec Tunnels" into pi-dev am: 8a047a0c52
am: e9ae13cabe

Change-Id: I9197eb54de99c9f5274d722cd25c35c654fa6137
2018-03-22 22:17:26 +00:00
TreeHugger Robot
6affc07065 Merge "APIs to suspend packages with SUSPEND_APPS permission" into pi-dev 2018-03-22 22:15:31 +00:00
Wale Ogunwale
402de825e7 Don't show unsupported sdk warning in test harness.
Also, added test api AM.alwaysShowUnsupportedCompileSdkWarning
that allows for forec showing the warning for an activity
component running in a test harness.

Change-Id: I72f6a8425cb6adc6060c70b2165aa82b459769f7
Fixes: 75455658
Test: atest CtsActivityManagerDeviceTestCases:PrereleaseSdkTest
2018-03-22 15:03:32 -07:00
Nathan Harold
e9ae13cabe Merge "Add AppOp for IpSec Tunnels" into pi-dev
am: 8a047a0c52

Change-Id: I159d49219d2f75e1f5aeece4196638a8823fc029
2018-03-22 21:35:36 +00:00
Nathan Harold
8a047a0c52 Merge "Add AppOp for IpSec Tunnels" into pi-dev 2018-03-22 21:14:36 +00:00
Amith Yamasani
bc813eb26e Provide app launch count in UsageStats
This counts the number of times the app was launched from outside
the app and ignores intra-app activity transitions.

Introduce a new permission for registering to observe app usage.

Fixes a bug where Settings couldn't force the app into another
bucket if it was recently launched.

Bug: 74335821
Fixes: 76100712
Test: Manual test using Settings
Test: UsageStatsTest to verify permission change
Change-Id: Ibd343c1cfa37089a3ac6fc30ba3194e21a9be499
2018-03-22 13:51:57 -07:00
Suprabh Shukla
021b57ab8d APIs to suspend packages with SUSPEND_APPS permission
Changed the existing hidden api setPackagesSuspendedAsUser to a system
api setPackagesSuspended that can be called by apps with either
MANAGE_USERS or SUSPEND_APPS permission. Additionally, the suspending
app can now specify optional extra information meant to be used by the
suspended apps and the launcher to deal with this state.

The following other APIs are added:
 - isPackageSuspended(): Apps can query whether they are in a suspended
 state
 - @SystemApi getPackageSuspendedAppExtras(String): Apps with permission
 SUSPEND_APPS can get the appExtras passed to PM when suspending the
 app.
 - @SystemApi setPackageSuspendedAppExtras(String, PersistableBundle):
 Apps with permission SUSPEND_APPS can update app extras for a
 suspended package.
 - getPackageSuspendedAppExtras(): Apps can call to get the appExtras
 passed in to PM when they were suspended.

Test: Can be run via:
atest com.android.server.pm.PackageManagerSettingsTests
atest com.android.server.pm.PackageUserStateTest
atest com.android.server.pm.SuspendPackagesTest

Bug: 74336673
Change-Id: I3b9ed2c8478b34ee2e8986f5f5fddb2839d102e3
2018-03-22 12:59:57 -07:00
Benjamin Franz
7cc9a817d4 Expose hidden API to check whether a given package is state protected
Bug: 75997475
Test: manual
Change-Id: I5e0da781af6d148aed2247175e8ee5d9f244ebe1
2018-03-22 18:10:06 +00:00
Julia Reynolds
5f3e3796b5 Merge "Fix index error" into pi-dev am: ae2f368907
am: 571c29428f

Change-Id: I000ceafa631ce39777eb1ef80503b7021de42170
2018-03-22 12:00:58 +00:00
Julia Reynolds
571c29428f Merge "Fix index error" into pi-dev
am: ae2f368907

Change-Id: I818ce7bfe0fc6cb5f0bbe25ede1ac443ab7ef052
2018-03-22 11:54:05 +00:00
Julia Reynolds
ae2f368907 Merge "Fix index error" into pi-dev 2018-03-22 11:39:28 +00:00
Tej Singh
8ebed82ccb Merge "ScheduledJobStateChanged: add stop reason" into pi-dev am: dcccfd9742
am: 7b0b2422ed

Change-Id: Ideaea9c44cbcda65111306b12079e75bbb5ce367
2018-03-22 02:20:22 +00:00
Tej Singh
7b0b2422ed Merge "ScheduledJobStateChanged: add stop reason" into pi-dev
am: dcccfd9742

Change-Id: Ie6d83624f3d607c5bd3d24aea0bcd28829a2f11a
2018-03-22 01:43:52 +00:00