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

204477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eino-Ville Talvala
c964884eb7 am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev 
* commit '1017f9862fb2cdfbff0abe12ef7d20b657a38e36':
  Camera2: Add camera type to getNumberOfCameras.
 2015-08-15 00:54:18 +00:00
Eino-Ville Talvala
1017f9862f Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev 2015-08-15 00:46:15 +00:00
Quddus Chong
b22f33e8fa am 6fa531e0: Merge "docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev 
* commit '6fa531e0153d9b76994adbc631fed0a591e7ef93':
  docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.
 2015-08-14 23:11:23 +00:00
Joe Fernandez
398eeaaaa6 am fbf170cb: Merge "docs: API diff report 22 to 23" into mnc-dev 
* commit 'fbf170cb1038d73138e4b73cee26cdd18a150ee3':
  docs: API diff report 22 to 23
 2015-08-14 23:07:07 +00:00
Quddus Chong
6fa531e015 Merge "docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev 2015-08-14 23:06:22 +00:00
Quddus Chong
44d911ffe2 docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery. 
Change-Id: Ib9a36ce62b137316ae2b8bc626a0b0377f593a21
 2015-08-14 15:59:07 -07:00
Andrew Solovay
d2acabba35 am 886e382d: Merge "docs: Added Javadoc links for new M Preview permissions methods" into mnc-dev 
* commit '886e382dd8fd08ba1dcdc7dee2f462026b872b41':
  docs: Added Javadoc links for new M Preview permissions methods
 2015-08-14 22:57:44 +00:00
David Friedman
c973ebac36 am 5bd5c25e: Merge "Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123" into mnc-dev 
* commit '5bd5c25ee509a095a823896b51fd897bbe0871c9':
  Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123
 2015-08-14 22:57:38 +00:00
Joe Fernandez
fbf170cb10 Merge "docs: API diff report 22 to 23" into mnc-dev 2015-08-14 22:57:17 +00:00
Andrew Solovay
886e382dd8 Merge "docs: Added Javadoc links for new M Preview permissions methods" into mnc-dev 2015-08-14 22:52:22 +00:00
David Friedman
5bd5c25ee5 Merge "Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123" into mnc-dev 2015-08-14 22:49:39 +00:00
Chris Craik
090341d7e0 am 63d3a610: (-s ours) am e3f0a881: Merge "Make the value for shadowRadius less than 1.0 work" 
* commit '63d3a610642b1cc5ed26a1ae21c335c33366c356':
  Make the value for shadowRadius less than 1.0 work
 2015-08-14 22:45:06 +00:00
David Friedman
a13f77e8d1 Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page 
Bug: 22947123

Change-Id: I49b72e160c40ea269a98a80356d61de49c306d96
 2015-08-14 15:37:30 -07:00
Andrew Solovay
fd7db54241 docs: Added Javadoc links for new M Preview permissions methods 
See first comment for doc stage location.

Change-Id: I6bf4c51e493d592a92d11028c2eeaac6afbc0954
 2015-08-14 15:34:40 -07:00
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
Joe Fernandez
ad55a8e39e docs: API diff report 22 to 23 
Change-Id: I7f8c5fb11e48520b91c90a8d26878b7413d3fb5b
 2015-08-14 15:24:43 -07: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
Chris Craik
63d3a61064 am e3f0a881: Merge "Make the value for shadowRadius less than 1.0 work" 
* commit 'e3f0a881c20072a644317330ecf7409c81e96888':
  Make the value for shadowRadius less than 1.0 work
 2015-08-14 22:13:43 +00:00
Chris Craik
e3f0a881c2 Merge "Make the value for shadowRadius less than 1.0 work" 2015-08-14 22:02:19 +00:00
Eino-Ville Talvala
5717612ba9 Camera2: Add camera type to getNumberOfCameras. 
Do not list strange cameras in old API; ensure new API gets all
cameras.

Bug: 23194168
Change-Id: Ia1fdffac245525674c913fefb1ec06e9094fe8d3
 2015-08-14 14:52:57 -07: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