Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
363,918 Commits 3 Branches 0 Tags
8bde24cf536ecaffd337704f44dea04ce0718eed
Commit Graph

13056 Commits

Author SHA1 Message Date
Alan Viverette
b15009eb2a Merge "Restore "Update packages for 1.0.0-beta1"" into pi-dev am: 259dd151f4 
am: 5ea38d0493

Change-Id: I02770c481e6a0df7bc17f17ffe7e094e82b4aaca
 2018-03-16 14:21:33 +00:00
Alan Viverette
5ea38d0493 Merge "Restore "Update packages for 1.0.0-beta1"" into pi-dev 
am: 259dd151f4

Change-Id: Ic2ac3ecafbfa6ff29580c86f7a639783b94f21dc
 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
72524977d7 Merge "SliceManager: Relax explicit checks on map a little bit" into pi-dev am: 0b795eb88e 
am: 6bea8a4bb9

Change-Id: I06ad802554654b29964d8cba1b4572b7b1d37574
 2018-03-16 02:58:42 +00:00
Jason Monk
6bea8a4bb9 Merge "SliceManager: Relax explicit checks on map a little bit" into pi-dev 
am: 0b795eb88e

Change-Id: I7b480717453d7ace26033066279a3c20e68cb7aa
 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)

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
Merged-In: Ib506ce38ac1ac7c0b91079ba9b35aca6ae289d22
Change-Id: Ib506ce38ac1ac7c0b91079ba9b35aca6ae289d22
 2018-03-15 15:48:58 -07:00
Makoto Onuki
68a2617af5 Merge "Fix deadlock regarding screen-capture-disabled" into pi-dev am: 70d24a0b1f 
am: 5a67d2973e

Change-Id: Ie88f4bd95f0a9276ed25c98c33e6e8831734e2c1
 2018-03-15 22:27:23 +00:00
Makoto Onuki
5a67d2973e Merge "Fix deadlock regarding screen-capture-disabled" into pi-dev 
am: 70d24a0b1f

Change-Id: I5569896a94ba6d34cb75b83bacdf44ddc8a9ae28
 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.

Bug: 74950017
Test: manual
Change-Id: I793ec0f6c2ba6a141481f8d03e85b791dd8a73d1
 2018-03-15 21:21:54 +00:00
Alan Viverette
b8bc6c2dd6 Merge "Revert "Update packages for 1.0.0-beta1"" into pi-dev am: 5b07f94a95 
am: 2a84507b70

Change-Id: I0d4f27625ff39941b9057830841fdb7ff161f9fb
 2018-03-15 21:02:37 +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

Change-Id: I567113f4f1a3506fb18588717b7bfd71cbc6ecb0
 2018-03-15 20:37:54 +00:00
Antoan Angelov
007406ee3d Merge "Move the support_transfer_ownership_metadata inside the device admin descriptor XML." into pi-dev am: 675db3f236 
am: 47d73e3ac1

Change-Id: I8a01541ae5699ecbe629dba55e0828c1e83dfa51
 2018-03-15 20:21:59 +00:00
Antoan Angelov
47d73e3ac1 Merge "Move the support_transfer_ownership_metadata inside the device admin descriptor XML." into pi-dev 
am: 675db3f236

Change-Id: I933134e5741cf264f38641629705a234175b90c7
 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.

Reason for revert: broke Settings

Bug: 74950017
Test: revert only
Change-Id: I7a535717d30ec79cd5a2f0529cb7ce511145e0ae
 2018-03-15 18:47:44 +00:00
Andreas Gampe
a13e22277c Merge "Frameworks: Fix system server profiling" am: eed99d8629 am: e8d1374024 
am: fbd7a82d00

Change-Id: I6dff945eab15bba13d0222840b261bd0008f40f2
 2018-03-15 17:38:33 +00:00
Andreas Gampe
fbd7a82d00 Merge "Frameworks: Fix system server profiling" am: eed99d8629 
am: e8d1374024

Change-Id: I228f91fb48566f541bfd8a84be71968b13992e2d
 2018-03-15 17:19:06 +00:00
Andreas Gampe
e8d1374024 Merge "Frameworks: Fix system server profiling" 
am: eed99d8629

Change-Id: Ia07782e694d066f827e99fffa49c93321444b851
 2018-03-15 17:10:15 +00:00
Alan Viverette
359c163db0 Merge "Update packages for 1.0.0-beta1" into pi-dev am: a88c9b558f 
am: 40f9aff681

Change-Id: If9aff68d7479b3efd246599b62f0e49245b21c8c
 2018-03-15 14:12:43 +00:00
Alan Viverette
40f9aff681 Merge "Update packages for 1.0.0-beta1" into pi-dev 
am: a88c9b558f

Change-Id: I602da6356d0523d7e3164026eb23e75160462a53
 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
414250d658 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 
am: d8a94c6ae4

Change-Id: I86b7d0c8e72c7b9dcae683c78203931264602171
 2018-03-15 04:59:00 +00: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

Change-Id: I9e58a2f71559cbf73b693f1fe808783157fc2f0a
 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
d1003fad76 Merge "Unhiding APIs in UsageEvents for public use" into pi-dev am: b33cef07f2 
am: 1495de2f15

Change-Id: Ia665dbac4683094e4e43f270ecd9feb40139d92d
 2018-03-15 01:51:00 +00:00
Suprabh Shukla
1495de2f15 Merge "Unhiding APIs in UsageEvents for public use" into pi-dev 
am: b33cef07f2

Change-Id: I6db57115f141dc3e84c89986c04a962d9bfe5b3f
 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
6031da66aa Merge "Improved Application.getAutofillClient()" into pi-dev am: 070db35bfb 
am: d7901bd0f0

Change-Id: I6bbfbcd4c3514d45e4948353ecaa856241ea3271
 2018-03-14 23:11:50 +00:00
Felipe Leme
d7901bd0f0 Merge "Improved Application.getAutofillClient()" into pi-dev 
am: 070db35bfb

Change-Id: I3deb8585d4901b267d3071d678f0a3cfcb5539f8
 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
9092bdeb30 Merge "Add API to get currently pinned slices" into pi-dev am: 98c1d17cb4 
am: 241a3a824d

Change-Id: I068f5a58ad82b31fad02209520f4890df5b8faff
 2018-03-14 20:54:13 +00:00
Jason Monk
241a3a824d Merge "Add API to get currently pinned slices" into pi-dev 
am: 98c1d17cb4

Change-Id: Ie71c82c8cc7734cf123adbc6342ca4154c04ba53
 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
8a1330c518 Merge "Fix issue #62342672: API Review: OPSTR_ACTIVATE_VPN SystemApi" into pi-dev am: bf5387edd8 
am: a31cb855f0

Change-Id: I0f97a84092e511024bbb55eac9074adc277dda4a
 2018-03-14 04:55:21 +00:00
Dianne Hackborn
a31cb855f0 Merge "Fix issue #62342672: API Review: OPSTR_ACTIVATE_VPN SystemApi" into pi-dev 
am: bf5387edd8

Change-Id: I713dedd3d5dc0c15031823191939979d3a169ae2
 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
b5e1cdf422 Merge "Ignore activity lifecycle requests without matching client records." into pi-dev am: 790c5d04c8 
am: 0ed5d65234

Change-Id: I18babb3442b3bd03266a0f17a5d87c247520de04
 2018-03-13 21:42:20 +00:00
Bryce Lee
0ed5d65234 Merge "Ignore activity lifecycle requests without matching client records." into pi-dev 
am: 790c5d04c8

Change-Id: I8c8b8799073bc92f0464fa79491db16cc10057ae
 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