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

204458 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
b774ed20ec am 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo..." into mnc-dev 
* commit '06f552cf9a89cd129beda8318a4832bd56d00796':
  Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...
 2015-08-14 22:27:14 +00:00
Dianne Hackborn
06f552cf9a Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo..." into mnc-dev 2015-08-14 22:17:50 +00:00
Andrew Solovay
3ed2a4e169 am eee09f49: Merge "cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18" into mnc-dev 
* commit 'eee09f495fa135c327429a9649908b0b40ac8754':
  cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18
 2015-08-14 21:49:40 +00:00
Andrew Solovay
eee09f495f Merge "cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18" into mnc-dev 2015-08-14 21:44:37 +00:00
Dan Albert
f13f1efab2 am 16e5aba9: am 4a2a890b: Merge "Fix mismatched new[]/delete." 
* commit '16e5aba9c8157b3ffdcdceda378896a43f074748':
  Fix mismatched new[]/delete.
 2015-08-14 21:43:16 +00:00
Dan Albert
16e5aba9c8 am 4a2a890b: Merge "Fix mismatched new[]/delete." 
* commit '4a2a890b32a1e8c3ffeea82b3c12f707b5a9b8f4':
  Fix mismatched new[]/delete.
 2015-08-14 21:33:07 +00:00
Dan Albert
4a2a890b32 Merge "Fix mismatched new[]/delete." 2015-08-14 21:23:29 +00:00
Dan Albert
8dc8313c3e Fix mismatched new[]/delete. 
The new clang will emit a warning for this.

Change-Id: Ie0edc46461eb5edb2a7ad33a3a7f6cef2d825c36
 2015-08-14 14:12:29 -07:00
Dianne Hackborn
ae49872100 Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo... 
...from Camera360 to Hangouts }

In the short URI toString, include a small summary of the ClipData (instead
of just saying it has a clip data).  This makes it a lot easier to understand
what is happening when you look at the log of activity starts.

Also separate out the activity manager dump of URI permission grants from
its dump of providers, so it is easy to just look at that state.

Change-Id: I68093d9f279944e1aa9a29347075f237f4f55ed3
 2015-08-14 14:08:43 -07:00
Adam Lesinski
9a9fd61e0b am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev 
* commit '0cd143adae642465a26a7eaac96030bb18826e94':
  AAPT: Fix regression in resource versioning
 2015-08-14 20:51:21 +00:00
Quddus Chong
930fa6d6f6 am b8fb239a: Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev 
* commit 'b8fb239ac53ab462c8de12635c84c2216cf57f3b':
  docs: Updated API Overview and Behavior Changes docs for M Preview 3.
 2015-08-14 20:51:14 +00:00
Adam Lesinski
0cd143adae Merge "AAPT: Fix regression in resource versioning" into mnc-dev 2015-08-14 20:46:49 +00:00
Quddus Chong
b8fb239ac5 Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev 2015-08-14 20:44:54 +00:00
Andrew Solovay
a2eebe858a cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. 
Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18

Added section describing the new support library methods. Also
updating lists of normal and dangerous permissions based on current
AndroidManifest in mnc-dev, as well as any other changes brought to my
attention.

See first comment for doc stage location.

Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18
 2015-08-14 13:44:14 -07:00
Adam Lesinski
beb9e33bfb AAPT: Fix regression in resource versioning 
With a set of resources with the following configurations:

()
(land)

the regression caused any resources that needed to be versioned in configuration () to be lost.

Bug:23038206
Change-Id: I2f1b0313fb780ac241e7aaa487cb37dfb79c36aa
 2015-08-14 13:41:46 -07:00
Daniel Sandler
72c982fa24 am 9f238a94: Merge "Introducing M Land." into mnc-dev 
* commit '9f238a9455639fccb6f44abd03752e3bb3bbc91e':
  Introducing M Land.
 2015-08-14 20:03:14 +00:00
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
9f238a9455 Merge "Introducing M Land." into mnc-dev 2015-08-14 19:59:48 +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
Dan Sandler
8df3cfe6b8 Introducing M Land. 
The "M" is for Multiplayer.

Bug: 21984798
Change-Id: Id752b8efe54ff0ac38854a129188027137d64dd5
 2015-08-14 15:51:13 -04: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
Quddus Chong
9b8e179d5e docs: Updated API Overview and Behavior Changes docs for M Preview 3. 
Change-Id: Ibff73ca9321ba1b117c361402d8045d9558c5c2f
 2015-08-14 10:22:09 -07: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