Commit Graph

13426 Commits

Author SHA1 Message Date
Jan Althaus
f967132284 Merge "Fixing incomplete RemoteAction clone" into pi-dev am: 739199f3e9
am: a1ef7a933b

Change-Id: I07ba0ae9fbfc795f36fd2ddd6acf4c5d18cfd154
2018-04-07 01:48:47 -07:00
Jan Althaus
a1ef7a933b Merge "Fixing incomplete RemoteAction clone" into pi-dev
am: 739199f3e9

Change-Id: I7e21a751ab3693c67ad6521e661a21d109e0c1fd
2018-04-07 01:31:35 -07:00
Jan Althaus
739199f3e9 Merge "Fixing incomplete RemoteAction clone" into pi-dev 2018-04-07 08:16:28 +00:00
Lorenzo Colitti
b595ce0d03 Merge changes from topic "unwanted" into pi-dev am: 2eae1e3a45
am: 9c119c93c9

Change-Id: I5acdadb525252f849d191012be62149b597389b4
2018-04-06 20:19:07 -07:00
Lorenzo Colitti
9c119c93c9 Merge changes from topic "unwanted" into pi-dev
am: 2eae1e3a45

Change-Id: Ib6f46ff91a6d774a516fa299284d9d552081dde6
2018-04-06 20:01:23 -07:00
Lorenzo Colitti
2eae1e3a45 Merge changes from topic "unwanted" into pi-dev
* changes:
  Add @param tag for state in queryDetailsForUidTagState.
  Remove unwanted capability code per API council feedback.
2018-04-07 02:41:40 +00:00
Selim Cinek
31e078d50b Merge "Added nullability annotations to API" into pi-dev am: 66b90a035f
am: 0bc1a4fab7

Change-Id: I5d1c67b2592bc5847059fac8e9ff2a8282f7acb3
2018-04-06 15:40:13 -07:00
Selim Cinek
0bc1a4fab7 Merge "Added nullability annotations to API" into pi-dev
am: 66b90a035f

Change-Id: I3b0101036d8c8929accb2632584a7464f1479e32
2018-04-06 15:19:27 -07:00
TreeHugger Robot
66b90a035f Merge "Added nullability annotations to API" into pi-dev 2018-04-06 22:06:04 +00:00
Selim Cinek
eb53c228f0 Added nullability annotations to API
Certain methods where left out in the new APIs

Change-Id: Ide1e2f387a4918f2134254d862eeff06bfd3a730
Fixes: 74409592
Test: only non-semantic changes
2018-04-06 13:39:59 -07:00
Fyodor Kupolov
8e75020431 Merge "Added dontSendToRestrictedApps broadcast option" into pi-dev am: 28faced973
am: 35ebfcac8c

Change-Id: I26d047e9ff7e6eaa4a2026a4ce0ad6aca0b30eee
2018-04-06 11:40:19 -07:00
Fyodor Kupolov
35ebfcac8c Merge "Added dontSendToRestrictedApps broadcast option" into pi-dev
am: 28faced973

Change-Id: Ieb5de4b3547ea38ea8e0dbdb14e296dde43142d3
2018-04-06 11:20:52 -07:00
Fyodor Kupolov
28faced973 Merge "Added dontSendToRestrictedApps broadcast option" into pi-dev 2018-04-06 17:57:10 +00:00
Selim Cinek
108ebd0c4d Merge "Migrated the Person class to its own file" into pi-dev am: cecec7bf5b
am: b1226660f6

Change-Id: I1066f90cf4a5a415dcf35abd9e27fea02073faf4
2018-04-06 09:37:58 -07:00
Selim Cinek
b1226660f6 Merge "Migrated the Person class to its own file" into pi-dev
am: cecec7bf5b

Change-Id: Iaa9543718ff66e305b6b3a4967d1a6c5edc81ca1
2018-04-06 09:19:34 -07:00
Selim Cinek
cecec7bf5b Merge "Migrated the Person class to its own file" into pi-dev 2018-04-06 15:59:34 +00:00
Lorenzo Colitti
53765e00d8 Add @param tag for state in queryDetailsForUidTagState.
Change-Id: I22de424ccb2b30b2a56edd17dc982565b8aa7d4a
Fix: 77518425
Test: make doc-comment-check-docs
2018-04-06 23:17:23 +09:00
Rubin Xu
e6402303c0 Merge "Tweak SystemUpdatePolicy APIs" into pi-dev am: 892ebd0285
am: 2171b32fff

Change-Id: Icbbeef7c835a1d685615bdf2bf19eb76adcbb68f
2018-04-06 06:20:55 -07:00
Rubin Xu
2171b32fff Merge "Tweak SystemUpdatePolicy APIs" into pi-dev
am: 892ebd0285

Change-Id: I8cd170af9b8b15fbd1010aad50e337e95fbfb97d
2018-04-06 06:07:54 -07:00
Rubin Xu
892ebd0285 Merge "Tweak SystemUpdatePolicy APIs" into pi-dev 2018-04-06 12:54:24 +00:00
Selim Cinek
0932cf70b2 Merge "Ensured that the reply icon isn't showing on HUNS" into pi-dev am: d7c3ba204c
am: a2508cb0d8

Change-Id: I3f8fe5bb3dd347a949576e4ac8ff703d32dbd1e2
2018-04-05 17:23:12 -07:00
Selim Cinek
9acd673c0d Migrated the Person class to its own file
Because we are expecting usage of Person across
other surfaces, we migrate the class out
of he Notification class which is already incredibly
huge.

Test: Migrated existing cts test
Change-Id: Ia487ae7965b5ca2b016245d21faa63e3b4628344
Fixes: 75980526
2018-04-05 17:21:11 -07:00
Selim Cinek
a2508cb0d8 Merge "Ensured that the reply icon isn't showing on HUNS" into pi-dev
am: d7c3ba204c

Change-Id: Ib660becd9ea2df4ffdc7808c75232c33200ed28d
2018-04-05 17:12:28 -07:00
TreeHugger Robot
d7c3ba204c Merge "Ensured that the reply icon isn't showing on HUNS" into pi-dev 2018-04-05 23:57:11 +00:00
Suprabh Shukla
acdfc1df62 Merge "Activity interceptor dialog for suspended apps" into pi-dev am: 822ce4f3aa
am: fce7bf015e

Change-Id: I20ef2001636ee1a75bcf5d9d7b097848bb15c710
2018-04-05 14:41:00 -07:00
Suprabh Shukla
fce7bf015e Merge "Activity interceptor dialog for suspended apps" into pi-dev
am: 822ce4f3aa

Change-Id: Id54f6edcbc854d6f58eae23d877884d1390c28c8
2018-04-05 14:29:46 -07:00
TreeHugger Robot
822ce4f3aa Merge "Activity interceptor dialog for suspended apps" into pi-dev 2018-04-05 21:15:19 +00:00
Jan Althaus
ab78047aa2 Fixing incomplete RemoteAction clone
Bug: 77631078
Test: atest CtsAndroidAppTestCases:android.app.cts.RemoteActionTest
Change-Id: Ifd6617baf67993141e2ee85def8fb84c88cbe3e7
2018-04-05 21:22:51 +02:00
Daniel Cardenas
a621840b7a Merge "Reduce log spam in TimeSparseArray" into pi-dev am: bd2e790946
am: a930996c24

Change-Id: I13a1bab02996e02a66ed6218bba0140223881b51
2018-04-05 11:52:22 -07:00
Daniel Cardenas
a930996c24 Merge "Reduce log spam in TimeSparseArray" into pi-dev
am: bd2e790946

Change-Id: Iffacb38ca50741f78c3d49aa5ace6416eb7280ab
2018-04-05 11:18:24 -07:00
TreeHugger Robot
bd2e790946 Merge "Reduce log spam in TimeSparseArray" into pi-dev 2018-04-05 18:01:52 +00:00
Rubin Xu
1b2f374018 Tweak SystemUpdatePolicy APIs
* Introduce a FreezePeriod class that represents a single freeze period
  and is defined by two MonthDay instances.
* Add ERROR_UNKNOWN to ValidationFailedException
* Make SystemUpdatePolicy final
* Document SystemUpdatePolicy.InstallationOption and add IntDef to getType()

Test: runtest frameworks-services -c com.android.server.devicepolicy.SystemUpdatePolicyTest
Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceOwnerTest#testSystemUpdatePolicy
Test: gts-tradefed run gts-dev --module GtsGmscoreHostTestCases --test com.google.android.gts.devicepolicy.DeviceOwnerTest#testSystemUpdatePolicy
Bug: 74976911
Change-Id: I85cf636c3a98c97bd03b7b296c3130028051a791
2018-04-05 14:26:52 +01:00
Rubin Xu
354cb645fa Merge "Device ID attestation: Add feature flag." into pi-dev am: 73961397e5
am: 1352861682

Change-Id: I564a99552bd1292dcc0dc85add1b836de028f85f
2018-04-05 03:13:25 -07:00
Rubin Xu
1352861682 Merge "Device ID attestation: Add feature flag." into pi-dev
am: 73961397e5

Change-Id: I4488f26e579639a82ee9759e1202ec29add77245
2018-04-05 02:54:53 -07:00
Rubin Xu
73961397e5 Merge "Device ID attestation: Add feature flag." into pi-dev 2018-04-05 09:38:28 +00:00
Suprabh Shukla
3c3af1406e Activity interceptor dialog for suspended apps
Added an AlertActivity to intercept the start for an activity belonging
to a suspended app. More details will be shown if the suspending app
also defines an activity to handle the API action
SHOW_SUSPENDED_APP_DETAILS.

Test: Added tests to existing classes. Can be run via:
atest com.android.server.pm.SuspendPackagesTest
atest com.android.server.pm.PackageManagerSettingsTests
atest com.android.server.pm.PackageUserStateTest

Bug: 75332201
Change-Id: I85dc4e9efd15eedba306ed5b856f651e3abd3e99
2018-04-04 18:40:19 -07:00
Fyodor Kupolov
da26eb3382 Added dontSendToRestrictedApps broadcast option
Sets whether pending intent can be sent for an application with
background restrictions

Test: manual
Bug: 77237719
Change-Id: I9acc2471f1dbd657ed9a6dd93888e04a6ae48d61
2018-04-04 16:39:24 -07:00
Makoto Onuki
04954b394b Merge "Simplify service wrapper initialization + make robust" into pi-dev am: 291988ef59
am: 7c878a7599

Change-Id: I024c14162d313a0e20c460b537f067732ee5e384
2018-04-04 15:12:27 -07:00
Makoto Onuki
7c878a7599 Merge "Simplify service wrapper initialization + make robust" into pi-dev
am: 291988ef59

Change-Id: Iaf87a5cf7f9bc3a949c55e8ca0f3eb91aebcbb24
2018-04-04 14:36:31 -07:00
Daniel Cardenas
8664e95613 Reduce log spam in TimeSparseArray
Change-Id: I8574f9e84be4e27be3946ed361475691d6ea03e0
Fixes: 77587733
Test: Build, excersize elfin device, monitor for logspam
2018-04-04 14:14:34 -07:00
tiansiming [田思明]
37584e2399 Merge "Merge "Modify isShowing method in Dialog" am: 46be1f15af am: 4b38e9587d" into pi-dev-plus-aosp
am: fc6096a745

Change-Id: Ica07fe42146df2480e476543ac3372bdaf9e363c
2018-04-04 13:47:03 -07:00
tiansiming [田思明]
b7c194721d Merge "Modify isShowing method in Dialog" am: 46be1f15af
am: 4b38e9587d

Change-Id: Icbd590ffa9a8d0c744bac8a97780857c18595100
2018-04-04 12:59:09 -07:00
tiansiming [田思明]
4b38e9587d Merge "Modify isShowing method in Dialog"
am: 46be1f15af

Change-Id: I9d1cd55d51c37571d199ebbb5975f490e0969a92
2018-04-04 12:47:13 -07:00
Makoto Onuki
d67070e1c1 Simplify service wrapper initialization + make robust
- Simplify the logic, no more AtomicIntegers.
- Make robust -- if we know we've successfully created an instance before,
but the instance is now gone, re-initialize again.
- Added CTS.

Bug: 75964116
Fixes: 75964116
Bug: 71882178
Fixes: 71882178
Test: Manual test with UC Browser
Test: atest /android/pi-dev/cts/tests/tests/content/src/android/content/cts/ContextTest.java#testGetSystemService_multiThreaded
Change-Id: I12a9834d0f62e90e6f5d806a124cbdade415440c
2018-04-04 12:16:35 -07:00
Treehugger Robot
46be1f15af Merge "Modify isShowing method in Dialog" 2018-04-04 18:39:38 +00:00
Tony Mak
69c5220b90 We should show custom title for suspend app dialog am: 706fbe7ed3
am: d3beaa57ae

Change-Id: Ie91198e54c738988ea00712c02f1a6f7dd7fa1dc
2018-04-04 04:00:17 -07:00
Tony Mak
706fbe7ed3 We should show custom title for suspend app dialog
BUG: 77523074

Test: Suspend an app, observe the new title.

Change-Id: I85f3d47e05332f7593a885130fd30dc5fd0a9960
2018-04-04 10:38:12 +00:00
tiansiming [田思明]
ca1c4d2755 Modify isShowing method in Dialog
The method isShowing in Dialog.java is to judge whether
the dialog is currently showing, but it will return true
when the dialog is hidden.

Bug: 74416088
Test: modify testShow in DialogTest.java (see 639879)
run cts -m CtsAppTestCases -t android.app.cts.DialogTest#testShow

Change-Id: Ibf15e080678f414f8a66ff0841be17a2f9d2d652
Signed-off-by: tiansiming [田思明] <tiansiming@xiaomi.com>
2018-04-04 10:54:24 +08:00
Winson Chung
8e50da2016 Prevent unnecessary reordering of the home stack am: 6a38fca2d8
am: 40fb4a289a

Change-Id: Ic448939e0e27f5e1baa9e83bcc10640ee0ed8013
2018-04-03 17:49:09 -07:00
Julia Reynolds
703b235bd0 Merge "Add method to get blocked channel counts" into pi-dev am: 7065aedba0
am: 8252bb0c0f

Change-Id: I9abef2af8d6a9bd0528012a13b55a2d5a2eed760
2018-04-03 17:37:10 -07:00