Alan Viverette
5ea38d0493
Merge "Restore "Update packages for 1.0.0-beta1"" into pi-dev
...
am: 259dd151f4
2018-03-16 14:06:04 +00:00
Alan Viverette
259dd151f4
Merge "Restore "Update packages for 1.0.0-beta1"" into pi-dev
2018-03-16 13:53:46 +00:00
TreeHugger Robot
a2d0f2f335
Merge "Frameworks: Fix system server profiling" into pi-dev
2018-03-16 04:00:48 +00:00
Jason Monk
6bea8a4bb9
Merge "SliceManager: Relax explicit checks on map a little bit" into pi-dev
...
am: 0b795eb88e
2018-03-16 02:07:06 +00:00
TreeHugger Robot
0b795eb88e
Merge "SliceManager: Relax explicit checks on map a little bit" into pi-dev
2018-03-16 00:11:53 +00:00
Andreas Gampe
4f68924d8b
Frameworks: Fix system server profiling
...
Avoid a race to close the profiling file descriptor.
(cherry picked from commit 5a8ea8c619
2018-03-15 15:48:58 -07:00
Makoto Onuki
5a67d2973e
Merge "Fix deadlock regarding screen-capture-disabled" into pi-dev
...
am: 70d24a0b1f
2018-03-15 22:08:30 +00:00
Jason Monk
135f4179f2
SliceManager: Relax explicit checks on map a little bit
...
Test: manual
Bug: 68378561
Change-Id: Iaf7e296dfd7dd355ca755386d1e2fb7b220abc15
2018-03-15 17:52:18 -04:00
Alan Viverette
e893588f19
Restore "Update packages for 1.0.0-beta1"
...
This reverts commit f980f54a75
2018-03-15 21:21:54 +00:00
Makoto Onuki
70d24a0b1f
Merge "Fix deadlock regarding screen-capture-disabled" into pi-dev
2018-03-15 21:01:49 +00:00
Alan Viverette
2a84507b70
Merge "Revert "Update packages for 1.0.0-beta1"" into pi-dev
...
am: 5b07f94a95
2018-03-15 20:37:54 +00:00
Antoan Angelov
47d73e3ac1
Merge "Move the support_transfer_ownership_metadata inside the device admin descriptor XML." into pi-dev
...
am: 675db3f236
2018-03-15 20:05:50 +00:00
Alan Viverette
5b07f94a95
Merge "Revert "Update packages for 1.0.0-beta1"" into pi-dev
2018-03-15 20:04:22 +00:00
Antoan Angelov
675db3f236
Merge "Move the support_transfer_ownership_metadata inside the device admin descriptor XML." into pi-dev
2018-03-15 19:40:13 +00:00
Alan Viverette
f980f54a75
Revert "Update packages for 1.0.0-beta1"
...
This reverts commit ad4d866837
2018-03-15 18:47:44 +00:00
Andreas Gampe
fbd7a82d00
Merge "Frameworks: Fix system server profiling" am: eed99d8629
...
am: e8d1374024
2018-03-15 17:19:06 +00:00
Andreas Gampe
e8d1374024
Merge "Frameworks: Fix system server profiling"
...
am: eed99d8629
2018-03-15 17:10:15 +00:00
Alan Viverette
40f9aff681
Merge "Update packages for 1.0.0-beta1" into pi-dev
...
am: a88c9b558f
2018-03-15 13:59:12 +00:00
Alan Viverette
a88c9b558f
Merge "Update packages for 1.0.0-beta1" into pi-dev
2018-03-15 13:32:16 +00:00
Andreas Gampe
5a8ea8c619
Frameworks: Fix system server profiling
...
Avoid a race to close the profiling file descriptor.
Bug: 74883338
Test: m
Test: am profile start `pid system_server` /data/local/tmp/test.trace && sleep 5s && am profile stop `pid system_server` && adb pull /data/local/tmp/test.trace && [[ $(find test.trace -size +1K) ]] && echo Success
Change-Id: Ib506ce38ac1ac7c0b91079ba9b35aca6ae289d22
2018-03-14 23:19:21 -07:00
Adora Zhang
d8a94c6ae4
Merge "Add notification category: CATEGORY_NAVIGATION; Add @SystemApi @hide notification categories: CATEGORY_CAR_EMERGENCY, CATEGORY_CAR_WARNING, and CATEGORY_CAR_INFORMATION." into pi-dev
...
am: 5d9617c439
2018-03-15 04:11:28 +00:00
TreeHugger Robot
5d9617c439
Merge "Add notification category: CATEGORY_NAVIGATION; Add @SystemApi @hide notification categories: CATEGORY_CAR_EMERGENCY, CATEGORY_CAR_WARNING, and CATEGORY_CAR_INFORMATION." into pi-dev
2018-03-15 03:00:46 +00:00
Suprabh Shukla
1495de2f15
Merge "Unhiding APIs in UsageEvents for public use" into pi-dev
...
am: b33cef07f2
2018-03-15 01:29:50 +00:00
TreeHugger Robot
b33cef07f2
Merge "Unhiding APIs in UsageEvents for public use" into pi-dev
2018-03-15 01:08:33 +00:00
Felipe Leme
d7901bd0f0
Merge "Improved Application.getAutofillClient()" into pi-dev
...
am: 070db35bfb
2018-03-14 22:36:19 +00:00
TreeHugger Robot
070db35bfb
Merge "Improved Application.getAutofillClient()" into pi-dev
2018-03-14 22:02:10 +00:00
Adora Zhang
aa90e8781f
Add notification category: CATEGORY_NAVIGATION;
...
Add @SystemApi @hide notification categories: CATEGORY_CAR_EMERGENCY, CATEGORY_CAR_WARNING, and CATEGORY_CAR_INFORMATION.
Bug: 74546526
Test: runtest -x tests/app/src/android/app/cts/NotificationTest.java
Change-Id: Ib997992e039d2eddbd9c744816c35e279f9f9682
2018-03-14 14:53:26 -07:00
Suprabh Shukla
4e12de81b8
Unhiding APIs in UsageEvents for public use
...
These apis are needed to interpret standby bucket change history
when using UsageStatsManager#queryEventsForSelf
Test: atest android.app.usage.cts.UsageStatsTest#testQueryEventsForSelf
Bug: 71906213
Change-Id: Ib9f458bf32089ad30c97eca9dd5cc4df5a392191
2018-03-14 14:27:09 -07:00
Jason Monk
241a3a824d
Merge "Add API to get currently pinned slices" into pi-dev
...
am: 98c1d17cb4
2018-03-14 20:41:12 +00:00
TreeHugger Robot
98c1d17cb4
Merge "Add API to get currently pinned slices" into pi-dev
2018-03-14 20:12:54 +00:00
Felipe Leme
950cc6b42b
Improved Application.getAutofillClient()
...
- Fixed usage of activity instead of record.activity
- Added (optional) verbose logging
Bug: 74793485
Test: atest CtsAutoFillServiceTestCases:VirtualContainerActivityTest#testAutofill_appContext\
CtsAutoFillServiceTestCases:VirtualContainerActivityCompatModeTest#testAutofill_appContext
Change-Id: I03721cab6428e580b13444bf045f33dc3d787a8d
2018-03-14 13:04:28 -07:00
Makoto Onuki
04ef44761d
Fix deadlock regarding screen-capture-disabled
...
- Introduced DevicePolicyCache, which stores a copy of device policies
that can be accessed with any lock held.
- Removed "wm screen-capture". According to code search, it's not being used,
and this command wasn't really working as intended, since DPM can always
override the manually set value.
Bug: 74277398
Test: atest /android/pi-dev/cts/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedDeviceOwnerTest.java#testScreenCaptureDisabled,testScreenCaptureDisabled_assist ; \
Test: atest /android/pi-dev/cts/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedProfileOwnerTest.java#testScreenCaptureDisabled,testScreenCaptureDisabled_assist ; \
Test: atest /android/pi-dev/cts/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedManagedProfileOwnerTest.java#testScreenCaptureDisabled,testScreenCaptureDisabled_assist
Change-Id: I1968d1c32145a715d0343f25cb9d58939514b597
2018-03-14 12:21:54 -07:00
Dianne Hackborn
a31cb855f0
Merge "Fix issue #62342672 : API Review: OPSTR_ACTIVATE_VPN SystemApi" into pi-dev
...
am: bf5387edd8
2018-03-14 03:14:45 +00:00
Dianne Hackborn
bf1b57d856
Fix issue #62342672 : API Review: OPSTR_ACTIVATE_VPN SystemApi
...
Add a new platform-only permission for being able to change
app ops mode, so nothing outside of the platform can do this.
Bug: 62342672
Test: Booted, ran, settings works, shell works, apps install
Change-Id: I372e649c019a8f9b95919ff0da6f56612d7061c2
2018-03-13 14:51:30 -07:00
Bryce Lee
0ed5d65234
Merge "Ignore activity lifecycle requests without matching client records." into pi-dev
...
am: 790c5d04c8
2018-03-13 20:40:02 +00:00
Bryce Lee
790c5d04c8
Merge "Ignore activity lifecycle requests without matching client records." into pi-dev
2018-03-13 19:46:03 +00:00
Bryce Lee
c940660bd5
Ignore activity lifecycle requests without matching client records.
...
Previously, changes were made to finish destroyed activities. This
prevented the code sending lifecycle requests to a non-existent
client record. However, there are scenarios where an activity can
be destroyed without being finished. Finishing these activities will
lead to side effects, such as the activity not being in history and
therefore not restored when navigated back to.
This changelist unlinks finishing from setting an activity's state to
destroyed. For now, we will suppress lifecycle requests client side
without matching records.
Fixes: 74403650
Fixes: 74409828
Bug: 71506345
Test: enable don't keep activities. navigate back and forth
Test: atest CtsActivityManagerDeviceTestCases:ActivityLifecycleTests#testRestoreFromKill
Test: atest CtsActivityManagerDeviceTestCases:ActivityLifecycleTests#testPausedWhenRecreatedFromInNonFocusedStack
Change-Id: I1b76a4758c3be27dc30ecac5ee56949a5b173754
2018-03-13 14:52:35 +00:00
Jason Monk
f7af1cb1c6
Merge "Run slice callbacks on thread they come in on" into pi-dev
...
am: a033fa7fdc
2018-03-13 14:05:56 +00:00
TreeHugger Robot
a033fa7fdc
Merge "Run slice callbacks on thread they come in on" into pi-dev
2018-03-13 13:54:18 +00:00
Andrii Kulian
add9934e68
Merge "Don't throw exception for duplicate resume" into pi-dev
...
am: ee83dd2cd0
2018-03-13 01:21:25 +00:00
Andrii Kulian
ee83dd2cd0
Merge "Don't throw exception for duplicate resume" into pi-dev
2018-03-13 00:21:26 +00:00
Alan Viverette
ad4d866837
Update packages for 1.0.0-beta1
...
Fixes references to changes Slices compat code.
Bug: 74449147
Test: make
Change-Id: I7a7f81d582d12b3813c0581446efec81ed5f6b48
2018-03-12 19:05:44 -04:00
Julia Reynolds
318b49c2ab
Merge "Log interruptive notifications" into pi-dev
...
am: dcf12d4a39
2018-03-12 23:05:40 +00:00
Winson Chung
8f819832c0
Merge "Expose whether a snapshot is a real snapshot" into pi-dev
...
am: 4aee38fd01
2018-03-12 21:47:35 +00:00
Andrew Grieve
60491925d3
Merge "Add Application.getProcessName()" into pi-dev
...
am: 44662a157e
2018-03-12 21:25:28 +00:00
Jason Monk
66cffd5ae6
Run slice callbacks on thread they come in on
...
Instead post a runnable that will trigger an ANR+crash if the app
doesn't respond in time.
Test: atest cts/tests/tests/slice
Bug: 74251457
Change-Id: Ieea7a8d8cb08d3bf0735b9f7b385f286839dacd8
2018-03-12 17:20:01 -04:00
Julia Reynolds
dcf12d4a39
Merge "Log interruptive notifications" into pi-dev
2018-03-12 21:10:59 +00:00
Bryce Lee
95aa518a2c
Merge "Update documentation for Activity#onCreate." into pi-dev
...
am: 2b9620cc71
2018-03-12 20:50:19 +00:00
Winson Chung
4aee38fd01
Merge "Expose whether a snapshot is a real snapshot" into pi-dev
2018-03-12 20:34:07 +00:00
Andrii Kulian
dfbf971688
Don't throw exception for duplicate resume
...
A double resume request is possible when an activity receives two
consequent transactions with relaunch requests and the second is one
is omitted. We still get two resume requests for the final state.
Fixes: 74074327
Test: FrameworksCoreTests:ActivityThreadTest
Change-Id: I8bb8594948a17b7fbf595a49026ff33b54b66049
2018-03-12 20:32:37 +00:00
