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

204439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Sandler
fa42d28f60 am 8ad3e817: Merge ""I tried to think of the most harmless thing."" into mnc-dev 
* commit '8ad3e81701a20169b3410a231302ce0c82f95100':
  "I tried to think of the most harmless thing."
 2015-08-14 20:03:08 +00:00
Daniel Sandler
8ad3e81701 Merge ""I tried to think of the most harmless thing."" into mnc-dev 2015-08-14 19:59:35 +00:00
Adam Lesinski
4fe0a44658 am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev 
* commit '504600bb09e51f0187d81cacb1dc2de77c6256b6':
  Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
 2015-08-14 19:45:55 +00:00
Adam Lesinski
504600bb09 Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev 2015-08-14 19:38:34 +00:00
Dan Sandler
deafeedc81 "I tried to think of the most harmless thing." 
Bug: 21984798
Change-Id: I33ffabb72c831ff814363601a82ac9a388cb1e99
 2015-08-14 15:25:55 -04:00
Julia Reynolds
9eec1c2aa5 am 7df411d0: Merge "Clear calling identity before getting the current user." into mnc-dev 
* commit '7df411d0cced4a849bcdca58fa3c27eb731e0862':
  Clear calling identity before getting the current user.
 2015-08-14 19:24:02 +00:00
Julia Reynolds
7df411d0cc Merge "Clear calling identity before getting the current user." into mnc-dev 2015-08-14 19:17:31 +00:00
Jean-Michel Trivi
2f160d38c0 am 16fa58cb: Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev 
* commit '16fa58cb133f539016a5e013897c7de7f58ff16d':
  Fix to check the incoming userid argument for RingtonePlayer
 2015-08-14 18:31:52 +00:00
Jean-Michel Trivi
16fa58cb13 Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev 2015-08-14 18:19:17 +00:00
Chris Tate
d7a164bf3f am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev 
* commit '7e7d79ef2f4aa6a8da86af459d419bd24c47b440':
  Make "Ask every time" actually work that way
 2015-08-14 17:15:18 +00:00
Dianne Hackborn
3ffc0f1e81 am 81f3a85a: Merge "Fix issue #22940169: "pm grant" can no longer grant permissions..." into mnc-dev 
* commit '81f3a85aa29d83ed1a5de4de1006587d375a1c77':
  Fix issue #22940169: "pm grant" can no longer grant permissions...
 2015-08-14 17:15:10 +00:00
Chris Tate
7e7d79ef2f Merge "Make "Ask every time" actually work that way" into mnc-dev 2015-08-14 17:11:30 +00:00
Dianne Hackborn
81f3a85aa2 Merge "Fix issue #22940169: "pm grant" can no longer grant permissions..." into mnc-dev 2015-08-14 17:06:20 +00:00
Svetoslav Ganov
03e64e4edd am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 
* commit 'b045331fcb033507072bfd7899a147bb2be7176e':
  Add GTS test to ensure valid default permission grants - framework
 2015-08-14 15:12:06 +00:00
Svetoslav Ganov
b045331fcb Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 2015-08-14 15:06:16 +00:00
Adam Lesinski
621e06a64d Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs 
System UIDs are also run as shared GIDs, so this should not throw
an exception.

Bug:23189342
Change-Id: Ia180db012c25615cde1720ae0d41d1378f7bfb1a
 2015-08-13 22:06:31 -07:00
Christopher Tate
56f0ff3c48 Make "Ask every time" actually work that way 
..in link-opening behavior.  If a candidate is marked as "ask
every time," then the user is guaranteed to get a disambiguation
prompt including that candidate even when some other candidate
app is in the "always prefer this over a browser" state.

Bug 23147746

Change-Id: I904d8697a992b3f16f32b1c1b49c2bf9424c7137
 2015-08-13 18:56:05 -07:00
Dianne Hackborn
9f5b0a2735 Fix issue #22940169: "pm grant" can no longer grant permissions... 
...with protection flag PROTECTION_FLAG_DEVELOPMENT

Bring back the old grant/revoke code for development permissions.

Also some more dumpsys output to help debugging.

And new dumpsys command for checking a permission.

Change-Id: I6e27e62a9ca5ec1ecc0f102714a448ea02f0f41c
 2015-08-13 18:25:20 -07:00
Jeff Sharkey
b53738f71e am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev 
* commit 'cfcf6af915bee878bdaea04f48592bbbe506ad26':
  Method to show DialogFragment allowing state loss.
 2015-08-14 01:24:36 +00:00
Joe Fernandez
619bbdf4a9 am 37dd5240: Merge "Doc change: Update preview pages for dp3." into mnc-dev 
* commit '37dd5240ad54494e028d6b2973729f5cb40ccad9':
  Doc change: Update preview pages for dp3.
 2015-08-14 01:18:56 +00:00
Jeff Sharkey
cfcf6af915 Merge "Method to show DialogFragment allowing state loss." into mnc-dev 2015-08-14 01:18:18 +00:00
Joe Fernandez
37dd5240ad Merge "Doc change: Update preview pages for dp3." into mnc-dev 2015-08-14 01:10:56 +00:00
Sungmin Choi
4a05bbcd38 Fix to check the incoming userid argument for RingtonePlayer 
In PowerNotificationWarnings, where it dispatches notifications
with UserHandle.ALL:
    mNoMan.notifyAsUser(TAG_NOTIFICATION, R.id.notification_power, n, UserHandle.ALL);
The fix is to have RingtonePlayer check the incoming userId argument to playAsync(),
and change USER_ALL to USER_OWNER.

BUG=22516181
BUG=22992637
Change-Id: Ia3f8aaa2bee7fb15c24542e2331b2bc5a877e715
 2015-08-13 17:07:11 -07:00
Jorim Jaggi
8de9d44583 am 81eeef58: Merge "Update time when turning on screen, in addition to waking up" into mnc-dev 
* commit '81eeef589386483722c21572d9ab6d3f95dd26be':
  Update time when turning on screen, in addition to waking up
 2015-08-13 23:57:55 +00:00
Jeff Sharkey
063f850060 Method to show DialogFragment allowing state loss. 
Same as show(), but allowing state loss.

Bug: 22867250
Change-Id: Ib779d8a3febc70ad47a9c1a9099d858707bad733
 2015-08-13 16:57:29 -07:00
Jorim Jaggi
81eeef5893 Merge "Update time when turning on screen, in addition to waking up" into mnc-dev 2015-08-13 23:51:11 +00:00
Jorim Jaggi
9373911d41 Update time when turning on screen, in addition to waking up 
When in ambient display mode, we didn't get a callback to
onStartedWakingUp, thus the time was never refreshed. Since
broadcasts are disabled in this low-power state, we need to refresh
the clock manually before turning on the screen, because we can't
rely on the broadcasts to be delivered.

Bug: 23171638
Change-Id: I249f4195a14995f7c1467e73ac2aa400b871f80e
 2015-08-13 15:56:41 -07:00
Joe Fernandez
c245093f96 am f7557729: Merge "docs: Update uses-sdk-element page with API 23 (M) listing" into mnc-dev 
* commit 'f75577295765ca13bf3d0d5bffa81b569cb88da2':
  docs: Update uses-sdk-element page with API 23 (M) listing
 2015-08-13 18:56:43 +00:00
Joe Fernandez
f755772957 Merge "docs: Update uses-sdk-element page with API 23 (M) listing" into mnc-dev 2015-08-13 18:49:40 +00:00
Joe Fernandez
901f807143 docs: Update uses-sdk-element page with API 23 (M) listing 
Change-Id: If579411c66f3cfc02b270a04b266fe7562b48e14
 2015-08-13 11:45:23 -07:00
Joe Fernandez
9f65f0a2c0 am 8d149d7f: Merge "docs: Update developer docs make file to include API 23" into mnc-dev 
* commit '8d149d7ff278c877bf7ccff7cc428cf7ba1db1e4':
  docs: Update developer docs make file to include API 23
 2015-08-13 18:33:58 +00:00
Joe Fernandez
8d149d7ff2 Merge "docs: Update developer docs make file to include API 23" into mnc-dev 2015-08-13 18:27:11 +00:00
Dirk Dougherty
2906bd5cb3 Doc change: Update preview pages for dp3. 
Change-Id: If4a3beab28cc2114cf01a2d6202dc072768960fc
 2015-08-13 10:54:50 -07:00
Mike Dodd
93eef42349 am 226ae04d: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev 
* commit '226ae04df4b3570d11b66d52a404b2c8b2ac50db':
  Set default SMS/MMS app to com.android.messaging (new AOSP app).
 2015-08-13 15:21:53 +00:00
Mike Dodd
226ae04df4 Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev 2015-08-13 15:16:39 +00:00
Jason Monk
692e9b3404 am 90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev 
* commit '90460c79d1af214e73428eac92b5761e743dec4d':
  Add more intelligence to bluetooth connection state
 2015-08-13 14:45:42 +00:00
Jason Monk
90460c79d1 Merge "Add more intelligence to bluetooth connection state" into mnc-dev 2015-08-13 14:38:46 +00:00
Julia Reynolds
ea6c448959 Clear calling identity before getting the current user. 
This is necessary so non-privilged apps can call setInterruptionFilter.

Bug: 23156657
Change-Id: Ia903a39626c93957276d66805446cd25a91341b5
 2015-08-13 09:01:33 -04:00
Bart Sears
48ce6d2701 am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev 
* commit 'bd29b07eab3956796a7a09d7612e42e22616f458':
  Fix Keyguard drawn timeout
 2015-08-13 06:58:47 +00:00
Bart Sears
bd29b07eab Merge "Fix Keyguard drawn timeout" into mnc-dev 2015-08-13 05:32:14 +00:00
Svet Ganov
52153f4c05 Add GTS test to ensure valid default permission grants - framework 
The platform grants runtime permissions by default to apps on the
system image that provide core device use cases which a user expects
to work out-of-the-box. We are now adding a test to ensure that
OEMs cannot pregrant premissions on non approved components.

bug:23043018

Change-Id: Id76717cce0ee59678956bd0be347d3c045fe4c51
 2015-08-12 21:57:59 -07:00
Joe Fernandez
1827e3230d docs: Update developer docs make file to include API 23 
Change-Id: I1bb9c37cafdfc7c78c23099a0fde2914f3068485
 2015-08-12 19:45:22 -07:00
Dianne Hackborn
6d52d7616d am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit 'ff9912d594bc5cdc10a4a224b9a2296bac50851b':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 00:57:51 +00:00
Dianne Hackborn
ff9912d594 Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 2015-08-13 00:46:59 +00:00
Jeff Sharkey
259198343b am c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev 
* commit 'c97509c0292910d7fb27e4c890ad4bc0ea723fec':
  Update ifaces when global restriction changes.
 2015-08-13 00:43:12 +00:00
Nick Kralevich
715bb2f64b am f3ae2603: am 10e0f079: Merge "SELinuxPolicyInstallReceiver: Switch to file_contexts.bin." 
* commit 'f3ae260367235e325adce10c9aadddfe8a3107c1':
  SELinuxPolicyInstallReceiver:  Switch to file_contexts.bin.
 2015-08-13 00:40:30 +00:00
Nick Kralevich
f3ae260367 am 10e0f079: Merge "SELinuxPolicyInstallReceiver: Switch to file_contexts.bin." 
* commit '10e0f07975e6e446763b733bb438df5715c3693d':
  SELinuxPolicyInstallReceiver:  Switch to file_contexts.bin.
 2015-08-12 23:57:58 +00:00
Jeff Sharkey
c97509c029 Merge "Update ifaces when global restriction changes." into mnc-dev 2015-08-12 23:51:55 +00:00
Nick Kralevich
10e0f07975 Merge "SELinuxPolicyInstallReceiver: Switch to file_contexts.bin." 2015-08-12 23:46:28 +00:00
Jeff Sharkey
9d14206594 Update ifaces when global restriction changes. 
Global restriction of background data only applies to metered
interfaces, but battery saver applies to all interfaces.  In the
very specific case where global background had been turned on while
battery saver was enabled, we'd end up with a stale battery saver
rule floating around.

This change triggers an update of iface rules when the global
restriction changes, giving us consistent behavior.

Bug: 23098198
Change-Id: I454dc71cf11d50a2e9e6122e8a801ff17039b43a
 2015-08-12 16:46:05 -07:00