Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
370,620 Commits 3 Branches 0 Tags
bf0dffad8a5364abb6b3bfa3a4c51bbae554d6cc
Commit Graph

13516 Commits

Author SHA1 Message Date
Jeff Sharkey
266ee2b1f1 Merge "Fix broken target SDK checks." into pi-dev am: aab3304a22 
am: 87caa7b9ad

Change-Id: I2d0d813284e483b05bf73d5d91fcfa13bce967d8
 2018-04-11 21:58:49 -07:00
Jeff Sharkey
87caa7b9ad Merge "Fix broken target SDK checks." into pi-dev 
am: aab3304a22

Change-Id: Ib43fd6704d6982104f11504b3d43db9edcfa9d41
 2018-04-11 21:49:58 -07:00
TreeHugger Robot
aab3304a22 Merge "Fix broken target SDK checks." into pi-dev 2018-04-12 04:40:06 +00:00
Jason Monk
30524c6f64 Merge "Fix docs and bug in SliceManager#bindSlice" into pi-dev am: c2375d9b3d 
am: df0975bba5

Change-Id: I932361f18e0619224e840f4582c729908818fa96
 2018-04-11 12:37:44 -07:00
Colin Cross
359652ed80 Merge "Revert "Update docs to match encryption requirements"" into pi-dev am: fcbbb72603 
am: 3b11a4cb19

Change-Id: Iea81963ea09510a5c3d1c8d801dde83201122743
 2018-04-11 12:32:06 -07:00
Bookatz
a156a23a46 Merge "StatsManager throws exceptions" into pi-dev am: 6b317915e8 
am: b1d3483102

Change-Id: Ib8b72e4a6a21300ba843325a69847856bd9346aa
 2018-04-11 11:56:31 -07:00
Jason Monk
df0975bba5 Merge "Fix docs and bug in SliceManager#bindSlice" into pi-dev 
am: c2375d9b3d

Change-Id: Id7145e9d6432586d295f59b67a4f3b7e44d935b1
 2018-04-11 11:56:07 -07:00
Colin Cross
3b11a4cb19 Merge "Revert "Update docs to match encryption requirements"" into pi-dev 
am: fcbbb72603

Change-Id: I7b66ab3cb2362a6fa91d90b4b7237d6f3760b406
 2018-04-11 11:44:45 -07:00
Bookatz
b1d3483102 Merge "StatsManager throws exceptions" into pi-dev 
am: 6b317915e8

Change-Id: I3de523046404285f3bcc7bfff598393d7c16820d
 2018-04-11 11:19:33 -07:00
TreeHugger Robot
c2375d9b3d Merge "Fix docs and bug in SliceManager#bindSlice" into pi-dev 2018-04-11 17:52:22 +00:00
Colin Cross
fcbbb72603 Merge "Revert "Update docs to match encryption requirements"" into pi-dev 2018-04-11 17:28:39 +00:00
Colin Cross
4da1774894 Revert "Update docs to match encryption requirements" 
This reverts commit cebb55ea9d.

Reason for revert: broke docs builds

Change-Id: I3a4b8d274141efec90fae2ed0b9324194288c635
 2018-04-11 17:27:24 +00:00
TreeHugger Robot
6b317915e8 Merge "StatsManager throws exceptions" into pi-dev 2018-04-11 17:02:06 +00:00
Florian Mayer
309f185877 Merge "Address API comments on NetworkStats#getDefaultNetwork." into pi-dev am: f1657a827f 
am: 3975415df5

Change-Id: Ic02215baf0f945d7fe1700e7ba8baf1ef1fd8f60
 2018-04-11 07:29:37 -07:00
Robert Berry
fc40d0837d Merge "Update docs to match encryption requirements" into pi-dev am: bfa13fe76f 
am: ed11ba6182

Change-Id: I04f1c3d166c8c4cc243608b6bcffddb734dc482a
 2018-04-11 07:18:23 -07:00
Florian Mayer
3975415df5 Merge "Address API comments on NetworkStats#getDefaultNetwork." into pi-dev 
am: f1657a827f

Change-Id: Ic7356df8144ca41a89bfbf194155bc41058a200d
 2018-04-11 07:15:16 -07:00
Robert Berry
ed11ba6182 Merge "Update docs to match encryption requirements" into pi-dev 
am: bfa13fe76f

Change-Id: I81f6a613bc8ef123ce33f53bfc6a44092d72a7a9
 2018-04-11 07:10:28 -07:00
Jason Monk
5ffacd06ac Fix docs and bug in SliceManager#bindSlice 
Test: cts
Change-Id: I812af1eda072c2af0b29454a05ea777d8f4c3c62
Fixes: 73123733
 2018-04-11 10:05:57 -04:00
Florian Mayer
f1657a827f Merge "Address API comments on NetworkStats#getDefaultNetwork." into pi-dev 2018-04-11 13:55:51 +00:00
Robert Berry
bfa13fe76f Merge "Update docs to match encryption requirements" into pi-dev 2018-04-11 13:49:45 +00:00
Lenka Trochtova
e405732291 Merge "Hide mandatory backup's API." into pi-dev am: a9431996c3 
am: 99aac99341

Change-Id: I53df6d238cae1e4cf529bb6bbc6fb60c5040fedf
 2018-04-11 05:28:09 -07:00
Lenka Trochtova
99aac99341 Merge "Hide mandatory backup's API." into pi-dev 
am: a9431996c3

Change-Id: Iba9983509efc0e4e6dbe0d7c0665547f6fec5be0
 2018-04-11 05:16:18 -07:00
Lenka Trochtova
27fd8217c1 Hide mandatory backup's API. 
Bug: 77801801
Bug: 73750212
Bug: 64012357

Test: make RunFrameworksServicesRoboTests
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test
com.android.cts.devicepolicy.DeviceOwnerTes
cts-tradefed run cts -m CtsBackupHostTestCase

Change-Id: I7699755309b3fbff7c3fec2a06a0f409fd4087de
 2018-04-11 12:33:28 +02:00
Lorenzo Colitti
6dba3936a2 Address API comments on NetworkStats#getDefaultNetwork. 
Bug: 76449091
Test: android.app.usage.cts.NetworkUsageStatsTest passes
Change-Id: I7f21e0bd7bc4b726058fc2e25542ff2c3173fabe
 2018-04-11 10:11:12 +00:00
Suprabh Shukla
5e5a6c375f Merge "Review of suspend/unsuspend APIs" into pi-dev am: 2188383b8a 
am: 03026cb894

Change-Id: Ifd15ef4d5db195b862cf800cf0d2fff11b26745d
 2018-04-11 01:08:11 -07:00
Suprabh Shukla
03026cb894 Merge "Review of suspend/unsuspend APIs" into pi-dev 
am: 2188383b8a

Change-Id: Ied0b92474f80760f084fd749587fce0953c8469b
 2018-04-11 00:55:38 -07:00
TreeHugger Robot
2188383b8a Merge "Review of suspend/unsuspend APIs" into pi-dev 2018-04-11 07:36:38 +00:00
Remi NGUYEN VAN
8229802150 Merge "Do not register callback for < MIN_THRESHOLD_BYTES" into pi-dev am: 788f87dab6 
am: 448cf3b116

Change-Id: Iba57f84546fe1720c39adfe6bdf7ad70fcd803e7
 2018-04-10 21:12:47 -07:00
Remi NGUYEN VAN
448cf3b116 Merge "Do not register callback for < MIN_THRESHOLD_BYTES" into pi-dev 
am: 788f87dab6

Change-Id: I7aab9434ab9b11fe588c057a4c2b774b09ad71d2
 2018-04-10 20:46:55 -07:00
Amith Yamasani
73e68bfed1 Merge "API Review: Rename getStandbyBucket to getAppStandbyBucket" into pi-dev am: 555767b616 
am: 5cca011bd1

Change-Id: I9f94bbb867d3d55e3f03f6af4e89bb00216e4b97
 2018-04-10 20:41:03 -07:00
Julia Reynolds
b9e8c4f1aa Merge "Ensure colors for active permission icons" into pi-dev am: 46d03c2914 
am: f4bf387e9d

Change-Id: Ifb8cb9e73a6ec2f72a3e83e9202f7f672d8463ee
 2018-04-10 20:22:17 -07:00
Remi NGUYEN VAN
788f87dab6 Merge "Do not register callback for < MIN_THRESHOLD_BYTES" into pi-dev 2018-04-11 03:18:57 +00:00
Amith Yamasani
5cca011bd1 Merge "API Review: Rename getStandbyBucket to getAppStandbyBucket" into pi-dev 
am: 555767b616

Change-Id: Ifb257e127e028c2edfaf16ed2785cb92e60e7705
 2018-04-10 20:12:47 -07:00
Julia Reynolds
f4bf387e9d Merge "Ensure colors for active permission icons" into pi-dev 
am: 46d03c2914

Change-Id: I10b3e82a207d542a4761687c08927841eba09ba5
 2018-04-10 19:49:55 -07:00
TreeHugger Robot
555767b616 Merge "API Review: Rename getStandbyBucket to getAppStandbyBucket" into pi-dev 2018-04-11 02:38:26 +00:00
TreeHugger Robot
46d03c2914 Merge "Ensure colors for active permission icons" into pi-dev 2018-04-11 02:22:01 +00:00
Jason Monk
0a83fef4ac Merge "List<SliceSpec> -> Set<SliceSpec>" into pi-dev am: 3c33d2b997 
am: a1bb34ac1f

Change-Id: I1fc7cecd154e4151792c90ada582f19aec53b2a1
 2018-04-10 19:08:28 -07:00
Bookatz
4f71629002 StatsManager throws exceptions 
When StatsManager fails to connect to statsd, it now throws an exception
for the caller to catch. It also throws an exception of the config being
added is of an unreadable format.

Due to backwards compatibility issues, the old APIs could not be
changed, so new ones were made to replace the old ones. The old ones are
now temporary and will be removed when the compatibility issue is
resolved.

Bug: 77648233
Test: gts-tradefed run gts-dev --module GtsStatsdHostTestCases
Change-Id: Ibea05883a29b9b3ef9927d2f8fe295eb99832ab7
 2018-04-10 19:07:32 -07:00
Jason Monk
a1bb34ac1f Merge "List<SliceSpec> -> Set<SliceSpec>" into pi-dev 
am: 3c33d2b997

Change-Id: I5afdd7f0a7e00de6305b3a930bf432a351df8d7b
 2018-04-10 18:58:45 -07:00
Suprabh Shukla
96212bca06 Review of suspend/unsuspend APIs 
Clarified the package extras bundle returned from
getSuspendedPackageAppExtras.
Moved the bundle arg to the last in LauncherApps.onPackagesSuspended and
clarified the contents of the Bundle.
isPackageSuspended(String) now throws a NameNotFoundException if the
package is not found.
Also, removed a permission check from isPackageSuspendedForUser.

Test: builds, boots, existing tests:
atest com.android.server.pm.SuspendPackagesTest

Bug: 77518983, 77517955, 77507744, 77801528
Change-Id: I06b5f69f8f8a079c206863cb6122e90be58366cd
 2018-04-10 17:34:12 -07:00
Jason Monk
4572d6cbaf Merge "Revert "List<SliceSpec> -> Set<SliceSpec>"" into pi-dev am: 9107b53c6d 
am: fa220e219b

Change-Id: Ib3910f93bc872e1bf2d059092173aebac935271f
 2018-04-10 17:30:04 -07:00
Jason Monk
2d3932eb4d List<SliceSpec> -> Set<SliceSpec> 
Test: update-api
Bug: 73123786
Change-Id: I5668023eda0efcadf40a20259a92624e6680659f
 2018-04-10 20:25:51 -04:00
Jason Monk
fa220e219b Merge "Revert "List<SliceSpec> -> Set<SliceSpec>"" into pi-dev 
am: 9107b53c6d

Change-Id: I392e8d905457bcd11a7d83bc330d992636e9e407
 2018-04-10 17:14:38 -07:00
Jason Monk
9107b53c6d Merge "Revert "List<SliceSpec> -> Set<SliceSpec>"" into pi-dev 2018-04-11 00:00:26 +00:00
Jason Monk
e280990dd6 Revert "List<SliceSpec> -> Set<SliceSpec>" 
This reverts commit e2a04b3ea4.

Bug: 73123786
Change-Id: I1f09893fb3c68650340495f2833eb678099a895f
 2018-04-11 00:00:04 +00:00
Jason Monk
9eff6399c0 Merge "List<SliceSpec> -> Set<SliceSpec>" into pi-dev am: ae42e1d0c2 
am: 67e71049b1

Change-Id: Idaa30c93f338228a19e8deb9852274e5e518fd18
 2018-04-10 16:58:23 -07:00
Jason Monk
67e71049b1 Merge "List<SliceSpec> -> Set<SliceSpec>" into pi-dev 
am: ae42e1d0c2

Change-Id: I4b5af94ddc84fd7c49b13bc6e072f4cba345d882
 2018-04-10 16:48:47 -07:00
Jason Monk
ae42e1d0c2 Merge "List<SliceSpec> -> Set<SliceSpec>" into pi-dev 2018-04-10 23:23:43 +00:00
Jeff Sharkey
aa1a911d9a Fix broken target SDK checks. 
Consider an app targeting the final API 28, but running on an older
build where "P" is still API 10000.  Those apps need to be treated as
legacy apps.

In general, the logical pattern that should be used when enforcing
target SDK behaviors is below.

For applying behavior to legacy apps:
    // BROKEN
    if (targetSdkVersion <= Build.VERSION_CODES.N_MR1) {
    // CORRECT
    if (targetSdkVersion < Build.VERSION_CODES.O) {

For applying behavior to new apps:
    // BROKEN
    if (targetSdkVersion > Build.VERSION_CODES.N_MR1) {
    // CORRECT
    if (targetSdkVersion >= Build.VERSION_CODES.O) {

Bug: 77865751
Test: builds, boots
Change-Id: Ia83bd446a940751d51a6542c7a5b9cca174c5296
 2018-04-10 15:18:15 -06:00
Julia Reynolds
b887b23ad3 Ensure colors for active permission icons 
Test: manual
Change-Id: I74c91109efaacad4f7743681877b874f77bda630
Fixes: 74512508
 2018-04-10 17:01:00 -04:00