drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
307,043 Commits 1 Branch 0 Tags
Commit Graph

307043 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ztenghui
010df88f90 Disable versioning for pathInterpolator when no-version-vectors is on. 
Test: manually build demo app for support lib, and works!
bug:33527757

Change-Id: I3badea18b2eb8cddea94f7e44f9129bb55ed9649
 2017-03-07 16:12:07 -08:00
Chad Brubaker
b09ac24c3c Merge "Add permission for instant apps creating foreground services" 2017-02-09 21:33:19 +00:00
Chris Tate
bc1d0ff042 Merge "Check bg persistent-app policy against base uid, not nominal" 2017-02-09 20:47:33 +00:00
Dianne Hackborn
3641585f07 Merge "Fix issue #34592078: Mobile broadcast crash observed randomly..." 2017-02-09 20:42:10 +00:00
Greg Plesur
0e39f18e26 Merge "Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am: 5659b15a94 am: 0265687aef" into nyc-mr2-dev-plus-aosp 
am: 1f26fadba7

Change-Id: Ia2ff41983c4b04f11e22c95fd4659bdd0521a1f6
 2017-02-09 20:10:04 +00:00
Greg Plesur
d8ede890bb Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am: 5659b15a94 am: 0265687aef 
am: d5c031c75b

Change-Id: Ie80bb180876c59bf28bde509feb97b2c7ae280cc
 2017-02-09 20:09:52 +00:00
Greg Plesur
e9459cfc8d Merge "Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am: 5659b15a94 am: 89085b1593" into nyc-mr2-dev-plus-aosp 
am: a55677651f

Change-Id: I5f26af7cedfeab861acae935af965392ef3ac810
 2017-02-09 20:08:26 +00:00
Greg Plesur
92ab94849f Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am: 5659b15a94 am: 89085b1593 
am: 7d297e7761

Change-Id: I73677c19bda940dc352daba699ed68b8d3a3d575
 2017-02-09 20:08:20 +00:00
Greg Plesur
d74e7c3530 Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked(). am: 735b4dc0af am: 968477129c 
am: e25194b067

Change-Id: Icce21145f9e86060a96c44064e63ac5416b934e7
 2017-02-09 20:07:18 +00:00
Greg Plesur
150a584aee Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked(). am: 735b4dc0af am: d78a0d21cb 
am: 82a3793269

Change-Id: I3f7fe9ba2c572eb0dda23386a62c50f58a6a08f9
 2017-02-09 20:06:10 +00:00
Jeff Sharkey
a51ae12b37 Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 78f2e38a12 -s ours am: b30169299b -s ours am: 31c7fa003d -s ours am: 966e600365 -s ours" into nyc-mr2-dev-plus-aosp 
am: 3b7ee3598f  -s ours

Change-Id: Iab23629aac79aa226a1d21508b4db9648537954b
 2017-02-09 20:04:47 +00:00
Jeff Sharkey
c48fc566b5 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 78f2e38a12 -s ours am: b30169299b -s ours am: 31c7fa003d -s ours am: 966e600365 -s ours 
am: 91aac0db54  -s ours

Change-Id: I67a75bf0e4fa073579420abc02d58735c606ad91
 2017-02-09 20:04:42 +00:00
Jeff Sharkey
4c90b31ac6 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 78f2e38a12 -s ours am: b30169299b -s ours am: 31c7fa003d -s ours am: 6d4af9c7f8 -s ours 
am: bbdec11843  -s ours

Change-Id: I57e2773891641ffa9d418d1cae70f3f234ad12f2
 2017-02-09 20:03:29 +00:00
Paul Duffin
6cd440c574 Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate"" am: 621ebe692f am: a2c92b0b88 am: c1a93884dc 
am: 8faed45024

Change-Id: I9d047f2e7bd8dfb14bf7b1f8c82ce6721e105198
 2017-02-09 20:02:25 +00:00
Android Build Merger (Role)
1f26fadba7 Merge "Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am: 5659b15a94 am: 0265687aef" into nyc-mr2-dev-plus-aosp 2017-02-09 19:58:23 +00:00
Android Build Merger (Role)
a55677651f Merge "Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am: 5659b15a94 am: 89085b1593" into nyc-mr2-dev-plus-aosp 2017-02-09 19:58:14 +00:00
Greg Plesur
d5c031c75b Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am: 5659b15a94 
am: 0265687aef

Change-Id: I4cd33b9e688d90d8555b91c6547dbffe3099e0ae
 2017-02-09 19:57:34 +00:00
Greg Plesur
7d297e7761 Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am: 5659b15a94 
am: 89085b1593

Change-Id: I50b457b5c6b5614d8b7c450b3ee6f7e375478194
 2017-02-09 19:57:28 +00:00
Greg Plesur
e25194b067 Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked(). am: 735b4dc0af 
am: 968477129c

Change-Id: I623dd515c8eae81b4146d67c83007fc5213561a2
 2017-02-09 19:56:28 +00:00
Greg Plesur
82a3793269 Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked(). am: 735b4dc0af 
am: d78a0d21cb

Change-Id: I2e45ee1174cb287d8ce142ac4176148ceca5b248
 2017-02-09 19:53:06 +00:00
Christopher Tate
7408813e3c Check bg persistent-app policy against base uid, not nominal 
SysUI, for example, needs to be able to start services in secondary
users, and in those users they run as the user-appropriate decorated
uid.

Bug 35200453
Test: verify user switch behavior via logging

Change-Id: Ia154f140e315fd97aed414c6444ba550632eb610
 2017-02-09 11:52:38 -08:00
Android Build Merger (Role)
3b7ee3598f Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 78f2e38a12 -s ours am: b30169299b -s ours am: 31c7fa003d -s ours am: 966e600365 -s ours" into nyc-mr2-dev-plus-aosp 2017-02-09 19:50:58 +00:00
Jeff Sharkey
91aac0db54 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 78f2e38a12 -s ours am: b30169299b -s ours am: 31c7fa003d -s ours 
am: 966e600365  -s ours

Change-Id: Ia3e044a2c4e2c71505d9666fbe0f3a0552f5e14f
 2017-02-09 19:50:10 +00:00
Greg Plesur
0265687aef Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev 
am: 5659b15a94

Change-Id: I9bb30911e82207da68c3c5f088ef9efd1edf75ca
 2017-02-09 19:50:03 +00:00
Jeff Sharkey
bbdec11843 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 78f2e38a12 -s ours am: b30169299b -s ours am: 31c7fa003d -s ours 
am: 6d4af9c7f8  -s ours

Change-Id: I5e6c70874400b8239dfc4be958a002d964f3d204
 2017-02-09 19:50:01 +00:00
Greg Plesur
89085b1593 Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev 
am: 5659b15a94

Change-Id: I4bb6bc892ea172b7bda1ccc5dd840de128908223
 2017-02-09 19:50:01 +00:00
Greg Plesur
968477129c Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked(). 
am: 735b4dc0af

Change-Id: Iafcc772f7f9c8111d26ebc48af67e104848e0885
 2017-02-09 19:49:58 +00:00
Greg Plesur
d78a0d21cb Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked(). 
am: 735b4dc0af

Change-Id: I5c8ca6d0a63af83cde91c17d10a634469c726442
 2017-02-09 19:49:58 +00:00
Jeff Sharkey
6d4af9c7f8 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 78f2e38a12 -s ours am: b30169299b -s ours 
am: 31c7fa003d  -s ours

Change-Id: I69602a5fbca3fd966c2bc8ab900b004308ce5f41
 2017-02-09 19:45:35 +00:00
Jeff Sharkey
966e600365 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 78f2e38a12 -s ours am: b30169299b -s ours 
am: 31c7fa003d  -s ours

Change-Id: Ia19b5ec4e496b8c87461081a23aef6335fe45725
 2017-02-09 19:45:34 +00:00
Greg Plesur
5659b15a94 Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev 2017-02-09 19:45:17 +00:00
Jeff Sharkey
31c7fa003d DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 78f2e38a12 -s ours 
am: b30169299b  -s ours

Change-Id: Iac47439b256367683e44d09042996ad060c3c43d
 2017-02-09 19:41:31 +00:00
Paul Duffin
8faed45024 Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate"" am: 621ebe692f am: a2c92b0b88 
am: c1a93884dc

Change-Id: Icce543cd86f83bff8c2e80bf7ef492d22c9cf2dc
 2017-02-09 19:37:26 +00:00
Jeff Sharkey
b30169299b DO NOT MERGE. Grant MMS Uri permissions as the calling UID. 
am: 78f2e38a12  -s ours

Change-Id: I51385a2b84bfc4e0fa387ceb644be523ca55ced3
 2017-02-09 19:37:23 +00:00
Paul Duffin
c1a93884dc Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate"" am: 621ebe692f 
am: a2c92b0b88

Change-Id: I605588603280ff0b4ebc1088c6c1f1c933c1e657
 2017-02-09 19:32:58 +00:00
Paul Duffin
a2c92b0b88 Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate"" 
am: 621ebe692f

Change-Id: Ifc6e7ac4f4a1bfc8c592d3b956ac985e9dd6e0ea
 2017-02-09 19:28:25 +00:00
Paul Duffin
621ebe692f Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate"" 2017-02-09 19:18:35 +00:00
Dianne Hackborn
3f13c54f14 Fix issue #34592078: Mobile broadcast crash observed randomly... 
...when using device on mobile data

Whitelist CellBroadcastReceiver, this is a core OS component anyway
so this probably makes sense.

Test: manual

Change-Id: I1560093640e81064ad123ff0bbcb307583fc47c6
 2017-02-09 11:07:18 -08:00
TreeHugger Robot
5d99e14ca9 Merge "Switch fragment tests to use TestableLooper" 2017-02-09 19:03:20 +00:00
TreeHugger Robot
cc8628202b Merge "Import translations. DO NOT MERGE" 2017-02-09 18:54:02 +00:00
Felipe Leme
660ea8c6d7 Merge "Guarded access to mCallback and check for null before using it." 2017-02-09 18:17:54 +00:00
TreeHugger Robot
f61cdcb60f Merge "Add a new setting to store the network recommendation app." 2017-02-09 18:16:17 +00:00
Jeff Sharkey
78f2e38a12 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. 
A recent security fix prevents the system UID from handing out Uri
permission grants directly from itself.  Instead, services need to
issue grants as the original calling UID to ensure that the caller
actually has access to the Uris.

Test: builds, boots, send/recv MMS works in primary/secondary users
Bug: 33231106
Change-Id: Ia9fe19843b52977c8a94ee5349b907beda1882fc
Merged-In: Ia9fe19843b52977c8a94ee5349b907beda1882fc
(cherry picked from commit 7ff418d9a9afb9ecf42f87fffd3e65477decb55e)
 2017-02-09 18:03:18 +00:00
Jeff Sharkey
4af90585e0 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: a78841ebd4 -s ours am: be0dab477e am: 47656a3cbd am: 99755cb458 am: 2b9ee48dae 
am: 70fd2f7197  -s ours

Change-Id: Ie6ddc1b5d9bc8ffeee147ac6734c2b561fe7b48f
 2017-02-09 17:57:51 +00:00
Jeff Sharkey
3eacb58a49 Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: a78841ebd4 -s ours am: be0dab477e am: 47656a3cbd am: 99755cb458 am: 0a2374524a" into nyc-mr2-dev-plus-aosp 
am: 37115274c0  -s ours

Change-Id: Ieb469af9a2748809f428394db82c1694699fc9f2
 2017-02-09 17:54:24 +00:00
Jeff Sharkey
1de3df7afc DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: a78841ebd4 -s ours am: be0dab477e am: 47656a3cbd am: 99755cb458 am: 0a2374524a 
am: b697587f20  -s ours

Change-Id: Ice8c2db54cd98fd642fcdfeb96c8f6e87cc2c989
 2017-02-09 17:54:19 +00:00
Jeff Sharkey
ce5a02bb64 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3eddf40675 am: 14b308de91 am: 19fd8e3f06 
am: 983dc41c8d  -s ours

Change-Id: Ie760d001d92437ea46781644a5fd780a9a9eca92
 2017-02-09 17:53:09 +00:00
Jeff Sharkey
70fd2f7197 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: a78841ebd4 -s ours am: be0dab477e am: 47656a3cbd am: 99755cb458 
am: 2b9ee48dae

Change-Id: I2d6e3e455df562561615c539474a8368c1371830
 2017-02-09 17:50:15 +00:00
Felipe Leme
3702b4760c Merge "Improved some toString() methods." 2017-02-09 17:47:23 +00:00
Android Build Merger (Role)
37115274c0 Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: a78841ebd4 -s ours am: be0dab477e am: 47656a3cbd am: 99755cb458 am: 0a2374524a" into nyc-mr2-dev-plus-aosp 2017-02-09 17:47:16 +00:00