OSDN Git Service

android-x86/frameworks-base.git
8 years agoam 454ba0b3: am 54c1efd8: am 5c7817bc: Merge "Update the RenderScript runtime documen...
Joe Fernandez [Mon, 17 Aug 2015 00:13:28 +0000 (00:13 +0000)]
am 454ba0b3: am 54c1efd8: am 5c7817bc: Merge "Update the RenderScript runtime documentation for MNC." into mnc-dev

* commit '454ba0b3a1a02400ddfbb1f4842af7729e6c3212':
  Update the RenderScript runtime documentation for MNC.

8 years agoam 54c1efd8: am 5c7817bc: Merge "Update the RenderScript runtime documentation for...
Joe Fernandez [Mon, 17 Aug 2015 00:06:16 +0000 (00:06 +0000)]
am 54c1efd8: am 5c7817bc: Merge "Update the RenderScript runtime documentation for MNC." into mnc-dev

* commit '54c1efd8449eddaf1d772e7d4e82efa40e2e4d85':
  Update the RenderScript runtime documentation for MNC.

8 years agoam 5c7817bc: Merge "Update the RenderScript runtime documentation for MNC." into...
Joe Fernandez [Sun, 16 Aug 2015 23:57:39 +0000 (23:57 +0000)]
am 5c7817bc: Merge "Update the RenderScript runtime documentation for MNC." into mnc-dev

* commit '5c7817bc2f784e6f48a7d26aadf901ac3eb7aca2':
  Update the RenderScript runtime documentation for MNC.

8 years agoMerge "Update the RenderScript runtime documentation for MNC." into mnc-dev
Joe Fernandez [Sun, 16 Aug 2015 20:25:45 +0000 (20:25 +0000)]
Merge "Update the RenderScript runtime documentation for MNC." into mnc-dev

8 years agoam 33689420: am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOf...
Eino-Ville Talvala [Sun, 16 Aug 2015 02:49:17 +0000 (02:49 +0000)]
am 33689420: am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev

* commit '33689420d13283f192c66ca7e78776064a2def28':
  Camera2: Add camera type to getNumberOfCameras.

8 years agoam 9f18c69c: am a99dd2c9: am 6fa531e0: Merge "docs: Updated gms_lists.js for GMS...
Quddus Chong [Sun, 16 Aug 2015 02:49:12 +0000 (02:49 +0000)]
am 9f18c69c: am a99dd2c9: am 6fa531e0: Merge "docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev

* commit '9f18c69cfe446b5af216a97ce00c88237f4a61f1':
  docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.

8 years agoam 674e5eb0: am d4828d67: am fbf170cb: Merge "docs: API diff report 22 to 23" into...
Joe Fernandez [Sun, 16 Aug 2015 02:49:06 +0000 (02:49 +0000)]
am 674e5eb0: am d4828d67: am fbf170cb: Merge "docs: API diff report 22 to 23" into mnc-dev

* commit '674e5eb0eb3c4bc4a624924affd4e02ccf1b0083':
  docs: API diff report 22 to 23

8 years agoam 24e05601: am 186c4c2f: am 886e382d: Merge "docs: Added Javadoc links for new M...
Andrew Solovay [Sun, 16 Aug 2015 02:49:00 +0000 (02:49 +0000)]
am 24e05601: am 186c4c2f: am 886e382d: Merge "docs: Added Javadoc links for new M Preview permissions methods" into mnc-dev

* commit '24e0560169f78666c855cee0cdbeb758e773a5ec':
  docs: Added Javadoc links for new M Preview permissions methods

8 years agoam 83f941b2: am f8134c85: am 5bd5c25e: Merge "Docs: Migration, rewrite of Doze/App...
David Friedman [Sun, 16 Aug 2015 02:48:54 +0000 (02:48 +0000)]
am 83f941b2: am f8134c85: am 5bd5c25e: Merge "Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123" into mnc-dev

* commit '83f941b24143b71c77885d91d95e34fa14f1da03':
  Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123

8 years agoam 574f9b42: am ac11522e: am 06f552cf: Merge "Add debugging for issue #23190084:...
Dianne Hackborn [Sun, 16 Aug 2015 02:48:48 +0000 (02:48 +0000)]
am 574f9b42: am ac11522e: am 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo..." into mnc-dev

* commit '574f9b42da2093823f5b0a7da1fbae9b2b38ba8d':
  Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...

8 years agoam 83e0a223: am 7a372767: am eee09f49: Merge "cherrypick from mnc-preview-docs docs...
Andrew Solovay [Sun, 16 Aug 2015 02:48:43 +0000 (02:48 +0000)]
am 83e0a223: am 7a372767: am eee09f49: Merge "cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18" into mnc-dev

* commit '83e0a223610be6fc38e39c40326e6a8a89f346fa':
  cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18

8 years agoam 085a6b42: am 89a3c5ad: am 0cd143ad: Merge "AAPT: Fix regression in resource versio...
Adam Lesinski [Sun, 16 Aug 2015 02:48:37 +0000 (02:48 +0000)]
am 085a6b42: am 89a3c5ad: am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev

* commit '085a6b42f49141089c142ae5364515af15a22f62':
  AAPT: Fix regression in resource versioning

8 years agoam ef7e8ccb: am 791def59: am b8fb239a: Merge "docs: Updated API Overview and Behavior...
Quddus Chong [Sun, 16 Aug 2015 02:48:32 +0000 (02:48 +0000)]
am ef7e8ccb: am 791def59: am b8fb239a: Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev

* commit 'ef7e8ccb185dbcddec29259c7a6a8b58096ecf52':
  docs: Updated API Overview and Behavior Changes docs for M Preview 3.

8 years agoam b66e755b: am 64b05c0f: am 9f238a94: Merge "Introducing M Land." into mnc-dev
Daniel Sandler [Sun, 16 Aug 2015 02:48:26 +0000 (02:48 +0000)]
am b66e755b: am 64b05c0f: am 9f238a94: Merge "Introducing M Land." into mnc-dev

* commit 'b66e755bdba57f163f25d08c207ef598eea7edae':
  Introducing M Land.

8 years agoam 415c6cb2: am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc...
Dan Sandler [Sun, 16 Aug 2015 02:48:19 +0000 (02:48 +0000)]
am 415c6cb2: am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev

* commit '415c6cb2358a0ad4821ec58c287b1de94de78d72':
  "I tried to think of the most harmless thing."

8 years agoam a5e012e6: Merge commit \'8dcda391c79e8c2fd20a87834f1f61645aa771ea\' into cw-e-dev
Geoff Mendal [Sun, 16 Aug 2015 02:39:19 +0000 (02:39 +0000)]
am a5e012e6: Merge commit \'8dcda391c79e8c2fd20a87834f1f61645aa771ea\' into cw-e-dev

* commit 'a5e012e6236aaeabd6d00fa7c6b29ec146ffd764':
  resolved conflicts for merge of 8ad3e817 to mnc-dr-dev

8 years agoam eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras....
Eino-Ville Talvala [Sun, 16 Aug 2015 02:37:19 +0000 (02:37 +0000)]
am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev

* commit 'eec25a4ffecc0c9a726aa284d29d0b7a1e58a888':
  Camera2: Add camera type to getNumberOfCameras.

8 years agoam a99dd2c9: am 6fa531e0: Merge "docs: Updated gms_lists.js for GMS v7.8 (Reblochon...
Quddus Chong [Sun, 16 Aug 2015 02:37:14 +0000 (02:37 +0000)]
am a99dd2c9: am 6fa531e0: Merge "docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev

* commit 'a99dd2c94448efc246ee2326912532f20bb38311':
  docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.

8 years agoam d4828d67: am fbf170cb: Merge "docs: API diff report 22 to 23" into mnc-dev
Joe Fernandez [Sun, 16 Aug 2015 02:37:10 +0000 (02:37 +0000)]
am d4828d67: am fbf170cb: Merge "docs: API diff report 22 to 23" into mnc-dev

* commit 'd4828d676d357a517cc5eecab86a59fd5fcba567':
  docs: API diff report 22 to 23

8 years agoam 186c4c2f: am 886e382d: Merge "docs: Added Javadoc links for new M Preview permissi...
Andrew Solovay [Sun, 16 Aug 2015 02:37:06 +0000 (02:37 +0000)]
am 186c4c2f: am 886e382d: Merge "docs: Added Javadoc links for new M Preview permissions methods" into mnc-dev

* commit '186c4c2f1d4713b01b0b37e6a043e9621c9d25a6':
  docs: Added Javadoc links for new M Preview permissions methods

8 years agoam f8134c85: am 5bd5c25e: Merge "Docs: Migration, rewrite of Doze/App Standby doc...
David Friedman [Sun, 16 Aug 2015 02:37:02 +0000 (02:37 +0000)]
am f8134c85: am 5bd5c25e: Merge "Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123" into mnc-dev

* commit 'f8134c85fed397770c68c86f0169c9fe46ccb7e9':
  Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123

8 years agoam ac11522e: am 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev...
Dianne Hackborn [Sun, 16 Aug 2015 02:36:58 +0000 (02:36 +0000)]
am ac11522e: am 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo..." into mnc-dev

* commit 'ac11522e540422d3afc691af5510da14ab7a3d40':
  Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...

8 years agoam 7a372767: am eee09f49: Merge "cherrypick from mnc-preview-docs docs: Preview 3...
Andrew Solovay [Sun, 16 Aug 2015 02:36:54 +0000 (02:36 +0000)]
am 7a372767: am eee09f49: Merge "cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18" into mnc-dev

* commit '7a3727671eb100c0e5d0dd663ff981f4f19e9a2e':
  cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18

8 years agoam 89a3c5ad: am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into...
Adam Lesinski [Sun, 16 Aug 2015 02:36:50 +0000 (02:36 +0000)]
am 89a3c5ad: am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev

* commit '89a3c5ad7508f5370126ef8454a6153f8d56bf37':
  AAPT: Fix regression in resource versioning

8 years agoam 791def59: am b8fb239a: Merge "docs: Updated API Overview and Behavior Changes...
Quddus Chong [Sun, 16 Aug 2015 02:36:45 +0000 (02:36 +0000)]
am 791def59: am b8fb239a: Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev

* commit '791def59b9858efd1334da5d01fb906051dcc028':
  docs: Updated API Overview and Behavior Changes docs for M Preview 3.

8 years agoam 64b05c0f: am 9f238a94: Merge "Introducing M Land." into mnc-dev
Daniel Sandler [Sun, 16 Aug 2015 02:36:39 +0000 (02:36 +0000)]
am 64b05c0f: am 9f238a94: Merge "Introducing M Land." into mnc-dev

* commit '64b05c0fd413d481cea19e9590732e8219a60912':
  Introducing M Land.

8 years agoam 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev
Dan Sandler [Sun, 16 Aug 2015 02:36:17 +0000 (02:36 +0000)]
am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev

* commit '8c8387d235b780c4a78a54d8240fe1f5a17c6af5':
  "I tried to think of the most harmless thing."

8 years agoMerge commit '8dcda391c79e8c2fd20a87834f1f61645aa771ea' into cw-e-dev
Geoff Mendal [Sun, 16 Aug 2015 02:25:34 +0000 (19:25 -0700)]
Merge commit '8dcda391c79e8c2fd20a87834f1f61645aa771ea' into cw-e-dev

8 years agoam 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev
Eino-Ville Talvala [Sun, 16 Aug 2015 01:34:42 +0000 (01:34 +0000)]
am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev

* commit '1017f9862fb2cdfbff0abe12ef7d20b657a38e36':
  Camera2: Add camera type to getNumberOfCameras.

8 years agoam 6fa531e0: Merge "docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc disco...
Quddus Chong [Sun, 16 Aug 2015 01:34:22 +0000 (01:34 +0000)]
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.

8 years agoam fbf170cb: Merge "docs: API diff report 22 to 23" into mnc-dev
Joe Fernandez [Sun, 16 Aug 2015 01:34:18 +0000 (01:34 +0000)]
am fbf170cb: Merge "docs: API diff report 22 to 23" into mnc-dev

* commit 'fbf170cb1038d73138e4b73cee26cdd18a150ee3':
  docs: API diff report 22 to 23

8 years agoam 886e382d: Merge "docs: Added Javadoc links for new M Preview permissions methods...
Andrew Solovay [Sun, 16 Aug 2015 01:34:13 +0000 (01:34 +0000)]
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

8 years agoam 5bd5c25e: Merge "Docs: Migration, rewrite of Doze/App Standby doc from M Preview...
David Friedman [Sun, 16 Aug 2015 01:34:08 +0000 (01:34 +0000)]
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

8 years agoam 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable...
Dianne Hackborn [Sun, 16 Aug 2015 01:34:04 +0000 (01:34 +0000)]
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...

8 years agoam eee09f49: Merge "cherrypick from mnc-preview-docs docs: Preview 3 permissions...
Andrew Solovay [Sun, 16 Aug 2015 01:33:55 +0000 (01:33 +0000)]
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

8 years agoam 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev
Adam Lesinski [Sun, 16 Aug 2015 01:33:48 +0000 (01:33 +0000)]
am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev

* commit '0cd143adae642465a26a7eaac96030bb18826e94':
  AAPT: Fix regression in resource versioning

8 years agoam b8fb239a: Merge "docs: Updated API Overview and Behavior Changes docs for M Previe...
Quddus Chong [Sun, 16 Aug 2015 01:33:44 +0000 (01:33 +0000)]
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.

8 years agoam 9f238a94: Merge "Introducing M Land." into mnc-dev
Daniel Sandler [Sun, 16 Aug 2015 01:33:37 +0000 (01:33 +0000)]
am 9f238a94: Merge "Introducing M Land." into mnc-dev

* commit '9f238a9455639fccb6f44abd03752e3bb3bbc91e':
  Introducing M Land.

8 years agoresolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev
Dan Sandler [Sat, 15 Aug 2015 22:33:29 +0000 (18:33 -0400)]
resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev

Change-Id: I5b47fdbb8a9712c104f12c25b80063048849cebd

8 years agoresolved conflicts for merge of 8ad3e817 to mnc-dr-dev
Daniel Sandler [Sat, 15 Aug 2015 04:16:41 +0000 (00:16 -0400)]
resolved conflicts for merge of 8ad3e817 to mnc-dr-dev

Change-Id: Ic4ea07a337b8d831f281b0a4048d0b4132597aa7

8 years agoUpdate the RenderScript runtime documentation for MNC.
Jean-Luc Brouillet [Thu, 13 Aug 2015 21:26:10 +0000 (14:26 -0700)]
Update the RenderScript runtime documentation for MNC.

Update the documentation to include the features introduced in MNC.

b/23190418

Change-Id: I2c6dc11029a9bc0c2ca9bb8b712d4fd4660c3b29

8 years agoMerge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev
Eino-Ville Talvala [Sat, 15 Aug 2015 00:46:15 +0000 (00:46 +0000)]
Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev

8 years agoMerge "docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into...
Quddus Chong [Fri, 14 Aug 2015 23:06:22 +0000 (23:06 +0000)]
Merge "docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev

8 years agodocs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.
Quddus Chong [Fri, 14 Aug 2015 22:57:53 +0000 (15:57 -0700)]
docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.

Change-Id: Ib9a36ce62b137316ae2b8bc626a0b0377f593a21

8 years agoMerge "docs: API diff report 22 to 23" into mnc-dev
Joe Fernandez [Fri, 14 Aug 2015 22:57:17 +0000 (22:57 +0000)]
Merge "docs: API diff report 22 to 23" into mnc-dev

8 years agoMerge "docs: Added Javadoc links for new M Preview permissions methods" into mnc-dev
Andrew Solovay [Fri, 14 Aug 2015 22:52:22 +0000 (22:52 +0000)]
Merge "docs: Added Javadoc links for new M Preview permissions methods" into mnc-dev

8 years agoMerge "Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page...
David Friedman [Fri, 14 Aug 2015 22:49:39 +0000 (22:49 +0000)]
Merge "Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123" into mnc-dev

8 years agoDocs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page
David Friedman [Wed, 12 Aug 2015 17:24:14 +0000 (10:24 -0700)]
Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page
Bug: 22947123

Change-Id: I49b72e160c40ea269a98a80356d61de49c306d96

8 years agodocs: Added Javadoc links for new M Preview permissions methods
Andrew Solovay [Fri, 14 Aug 2015 22:13:54 +0000 (15:13 -0700)]
docs: Added Javadoc links for new M Preview permissions methods

See first comment for doc stage location.

Change-Id: I6bf4c51e493d592a92d11028c2eeaac6afbc0954

8 years agodocs: API diff report 22 to 23
Joe Fernandez [Fri, 14 Aug 2015 22:24:43 +0000 (15:24 -0700)]
docs: API diff report 22 to 23

Change-Id: I7f8c5fb11e48520b91c90a8d26878b7413d3fb5b

8 years agoMerge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...
Dianne Hackborn [Fri, 14 Aug 2015 22:17:50 +0000 (22:17 +0000)]
Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo..." into mnc-dev

8 years agoCamera2: Add camera type to getNumberOfCameras.
Eino-Ville Talvala [Fri, 14 Aug 2015 20:11:16 +0000 (13:11 -0700)]
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

8 years agoMerge "cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original...
Andrew Solovay [Fri, 14 Aug 2015 21:44:37 +0000 (21:44 +0000)]
Merge "cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18" into mnc-dev

8 years agoAdd debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...
Dianne Hackborn [Fri, 14 Aug 2015 20:29:47 +0000 (13:29 -0700)]
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

8 years agoMerge "AAPT: Fix regression in resource versioning" into mnc-dev
Adam Lesinski [Fri, 14 Aug 2015 20:46:49 +0000 (20:46 +0000)]
Merge "AAPT: Fix regression in resource versioning" into mnc-dev

8 years agoMerge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into...
Quddus Chong [Fri, 14 Aug 2015 20:44:54 +0000 (20:44 +0000)]
Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev

8 years agocherrypick from mnc-preview-docs docs: Preview 3 permissions docs.
Andrew Solovay [Wed, 22 Jul 2015 21:43:49 +0000 (14:43 -0700)]
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

8 years agoAAPT: Fix regression in resource versioning
Adam Lesinski [Fri, 14 Aug 2015 20:16:18 +0000 (13:16 -0700)]
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

8 years agoam 546909c9: am 479c482c: am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid...
Adam Lesinski [Fri, 14 Aug 2015 20:04:16 +0000 (20:04 +0000)]
am 546909c9: am 479c482c: am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev

* commit '546909c9901f3acc659b3402fbf7320c96f562ad':
  Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs

8 years agoMerge "Introducing M Land." into mnc-dev
Daniel Sandler [Fri, 14 Aug 2015 19:59:48 +0000 (19:59 +0000)]
Merge "Introducing M Land." into mnc-dev

8 years agoMerge ""I tried to think of the most harmless thing."" into mnc-dev
Daniel Sandler [Fri, 14 Aug 2015 19:59:35 +0000 (19:59 +0000)]
Merge ""I tried to think of the most harmless thing."" into mnc-dev

8 years agoam 479c482c: am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow...
Adam Lesinski [Fri, 14 Aug 2015 19:56:38 +0000 (19:56 +0000)]
am 479c482c: am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev

* commit '479c482ca1788235afc776125eb6a79f1d9281c8':
  Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs

8 years agoIntroducing M Land.
Dan Sandler [Thu, 13 Aug 2015 17:30:55 +0000 (13:30 -0400)]
Introducing M Land.

The "M" is for Multiplayer.

Bug: 21984798
Change-Id: Id752b8efe54ff0ac38854a129188027137d64dd5

8 years agoam 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs...
Adam Lesinski [Fri, 14 Aug 2015 19:47:54 +0000 (19:47 +0000)]
am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev

* commit '504600bb09e51f0187d81cacb1dc2de77c6256b6':
  Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs

8 years agoam 4e65a05f: am ac5f9628: am 7df411d0: Merge "Clear calling identity before getting...
Julia Reynolds [Fri, 14 Aug 2015 19:43:21 +0000 (19:43 +0000)]
am 4e65a05f: am ac5f9628: am 7df411d0: Merge "Clear calling identity before getting the current user." into mnc-dev

* commit '4e65a05fb9d23f732e1cb72b67bc4fb2b7321788':
  Clear calling identity before getting the current user.

8 years agoMerge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev
Adam Lesinski [Fri, 14 Aug 2015 19:38:34 +0000 (19:38 +0000)]
Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev

8 years agoam ac5f9628: am 7df411d0: Merge "Clear calling identity before getting the current...
Julia Reynolds [Fri, 14 Aug 2015 19:30:28 +0000 (19:30 +0000)]
am ac5f9628: am 7df411d0: Merge "Clear calling identity before getting the current user." into mnc-dev

* commit 'ac5f962898de5a00fa2067e987b94bc28c5bb096':
  Clear calling identity before getting the current user.

8 years ago"I tried to think of the most harmless thing."
Dan Sandler [Mon, 3 Aug 2015 21:42:54 +0000 (17:42 -0400)]
"I tried to think of the most harmless thing."

Bug: 21984798
Change-Id: I33ffabb72c831ff814363601a82ac9a388cb1e99

8 years agoam 7df411d0: Merge "Clear calling identity before getting the current user." into...
Julia Reynolds [Fri, 14 Aug 2015 19:22:04 +0000 (19:22 +0000)]
am 7df411d0: Merge "Clear calling identity before getting the current user." into mnc-dev

* commit '7df411d0cced4a849bcdca58fa3c27eb731e0862':
  Clear calling identity before getting the current user.

8 years agoMerge "Clear calling identity before getting the current user." into mnc-dev
Julia Reynolds [Fri, 14 Aug 2015 19:17:31 +0000 (19:17 +0000)]
Merge "Clear calling identity before getting the current user." into mnc-dev

8 years agoam 4fb3e9b3: am 50ff3afb: Start pulse fading exactly when screen is turned on
Jorim Jaggi [Fri, 14 Aug 2015 19:10:43 +0000 (19:10 +0000)]
am 4fb3e9b3: am 50ff3afb: Start pulse fading exactly when screen is turned on

* commit '4fb3e9b3af6c44b3b4bc7eee0cb917520aa7474d':
  Start pulse fading exactly when screen is turned on

8 years agoam 50ff3afb: Start pulse fading exactly when screen is turned on
Jorim Jaggi [Fri, 14 Aug 2015 19:01:55 +0000 (19:01 +0000)]
am 50ff3afb: Start pulse fading exactly when screen is turned on

* commit '50ff3afb01f2ac4a93dba418a71d54ad8adeba9d':
  Start pulse fading exactly when screen is turned on

8 years agoStart pulse fading exactly when screen is turned on
Jorim Jaggi [Thu, 13 Aug 2015 01:35:42 +0000 (18:35 -0700)]
Start pulse fading exactly when screen is turned on

Bug: 23163299
Change-Id: I0f6d5dbfa02e455292e06a4f8f69ab68e9da2b6b

8 years agoam db56efe6: am 2152edeb: am 16fa58cb: Merge "Fix to check the incoming userid argume...
Jean-Michel Trivi [Fri, 14 Aug 2015 18:47:04 +0000 (18:47 +0000)]
am db56efe6: am 2152edeb: am 16fa58cb: Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev

* commit 'db56efe685d249e1e0e415b3e5b2086b5c2c205c':
  Fix to check the incoming userid argument for RingtonePlayer

8 years agoam 2152edeb: am 16fa58cb: Merge "Fix to check the incoming userid argument for Ringto...
Jean-Michel Trivi [Fri, 14 Aug 2015 18:38:51 +0000 (18:38 +0000)]
am 2152edeb: am 16fa58cb: Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev

* commit '2152edeb3058ab9072b843bb32fbbadcc3957460':
  Fix to check the incoming userid argument for RingtonePlayer

8 years agoam 16fa58cb: Merge "Fix to check the incoming userid argument for RingtonePlayer...
Jean-Michel Trivi [Fri, 14 Aug 2015 18:33:08 +0000 (18:33 +0000)]
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

8 years agoMerge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev
Jean-Michel Trivi [Fri, 14 Aug 2015 18:19:17 +0000 (18:19 +0000)]
Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev

8 years agoam b2d4c550: am b47890c4: am 7e7d79ef: Merge "Make "Ask every time" actually work...
Chris Tate [Fri, 14 Aug 2015 17:30:05 +0000 (17:30 +0000)]
am b2d4c550: am b47890c4: am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev

* commit 'b2d4c5507f82286cbb4b3d06f813459e6591164a':
  Make "Ask every time" actually work that way

8 years agoam e2fd2850: am 9e398eb5: am 81f3a85a: Merge "Fix issue #22940169: "pm grant" can...
Dianne Hackborn [Fri, 14 Aug 2015 17:29:59 +0000 (17:29 +0000)]
am e2fd2850: am 9e398eb5: am 81f3a85a: Merge "Fix issue #22940169: "pm grant" can no longer grant permissions..." into mnc-dev

* commit 'e2fd2850450391bba5892faf4e90aff9107dd5dc':
  Fix issue #22940169: "pm grant" can no longer grant permissions...

8 years agodocs: Updated API Overview and Behavior Changes docs for M Preview 3.
Quddus Chong [Tue, 11 Aug 2015 22:44:45 +0000 (15:44 -0700)]
docs: Updated API Overview and Behavior Changes docs for M Preview 3.

Change-Id: Ibff73ca9321ba1b117c361402d8045d9558c5c2f

8 years agoam b47890c4: am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into...
Chris Tate [Fri, 14 Aug 2015 17:21:52 +0000 (17:21 +0000)]
am b47890c4: am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev

* commit 'b47890c4e7a7fc119e74da2b50bf94c2cf172916':
  Make "Ask every time" actually work that way

8 years agoam 9e398eb5: am 81f3a85a: Merge "Fix issue #22940169: "pm grant" can no longer grant...
Dianne Hackborn [Fri, 14 Aug 2015 17:21:46 +0000 (17:21 +0000)]
am 9e398eb5: am 81f3a85a: Merge "Fix issue #22940169: "pm grant" can no longer grant permissions..." into mnc-dev

* commit '9e398eb51497dbcd2347cb1315933fa4e7cfcd9e':
  Fix issue #22940169: "pm grant" can no longer grant permissions...

8 years agoam 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev
Chris Tate [Fri, 14 Aug 2015 17:15:37 +0000 (17:15 +0000)]
am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev

* commit '7e7d79ef2f4aa6a8da86af459d419bd24c47b440':
  Make "Ask every time" actually work that way

8 years agoam 81f3a85a: Merge "Fix issue #22940169: "pm grant" can no longer grant permissions...
Dianne Hackborn [Fri, 14 Aug 2015 17:15:33 +0000 (17:15 +0000)]
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...

8 years agoMerge "Make "Ask every time" actually work that way" into mnc-dev
Chris Tate [Fri, 14 Aug 2015 17:11:30 +0000 (17:11 +0000)]
Merge "Make "Ask every time" actually work that way" into mnc-dev

8 years agoMerge "Fix issue #22940169: "pm grant" can no longer grant permissions..." into mnc-dev
Dianne Hackborn [Fri, 14 Aug 2015 17:06:20 +0000 (17:06 +0000)]
Merge "Fix issue #22940169: "pm grant" can no longer grant permissions..." into mnc-dev

8 years agoam 7c3d595a: am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default...
Svetoslav Ganov [Fri, 14 Aug 2015 15:26:59 +0000 (15:26 +0000)]
am 7c3d595a: am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev

* commit '7c3d595a3d2bdded486a01d6b00a435f4881ceed':
  Add GTS test to ensure valid default permission grants - framework

8 years agoam 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission...
Svetoslav Ganov [Fri, 14 Aug 2015 15:19:47 +0000 (15:19 +0000)]
am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev

* commit '4b655fd193992afff948df513c7b9b9a0389972e':
  Add GTS test to ensure valid default permission grants - framework

8 years agoam b045331f: Merge "Add GTS test to ensure valid default permission grants - framewor...
Svetoslav Ganov [Fri, 14 Aug 2015 15:13:38 +0000 (15:13 +0000)]
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

8 years agoMerge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev
Svetoslav Ganov [Fri, 14 Aug 2015 15:06:16 +0000 (15:06 +0000)]
Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev

8 years agoFix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
Adam Lesinski [Fri, 14 Aug 2015 05:06:31 +0000 (22:06 -0700)]
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

8 years agoMake "Ask every time" actually work that way
Christopher Tate [Thu, 13 Aug 2015 23:29:33 +0000 (16:29 -0700)]
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

8 years agoam d28991a5: am b6f5bcd0: am cfcf6af9: Merge "Method to show DialogFragment allowing...
Jeff Sharkey [Fri, 14 Aug 2015 01:42:07 +0000 (01:42 +0000)]
am d28991a5: am b6f5bcd0: am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev

* commit 'd28991a5e4c8b32c1bffab6078e93249c1d5b7a6':
  Method to show DialogFragment allowing state loss.

8 years agoam b6f5bcd0: am cfcf6af9: Merge "Method to show DialogFragment allowing state loss...
Jeff Sharkey [Fri, 14 Aug 2015 01:35:40 +0000 (01:35 +0000)]
am b6f5bcd0: am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev

* commit 'b6f5bcd0c64676ad2dfddc9dcf4c4320fafb9d3a':
  Method to show DialogFragment allowing state loss.

8 years agoam e135f5b7: am 672c0a75: am 37dd5240: Merge "Doc change: Update preview pages for...
Joe Fernandez [Fri, 14 Aug 2015 01:33:57 +0000 (01:33 +0000)]
am e135f5b7: am 672c0a75: am 37dd5240: Merge "Doc change: Update preview pages for dp3." into mnc-dev

* commit 'e135f5b70596ac3857983c0e4abbba5565dad6ea':
  Doc change: Update preview pages for dp3.

8 years agoFix issue #22940169: "pm grant" can no longer grant permissions...
Dianne Hackborn [Fri, 14 Aug 2015 01:25:20 +0000 (18:25 -0700)]
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

8 years agoam 672c0a75: am 37dd5240: Merge "Doc change: Update preview pages for dp3." into...
Joe Fernandez [Fri, 14 Aug 2015 01:24:46 +0000 (01:24 +0000)]
am 672c0a75: am 37dd5240: Merge "Doc change: Update preview pages for dp3." into mnc-dev

* commit '672c0a75d3905825365394d174b983dc5e796cf3':
  Doc change: Update preview pages for dp3.

8 years agoam cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev
Jeff Sharkey [Fri, 14 Aug 2015 01:24:44 +0000 (01:24 +0000)]
am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev

* commit 'cfcf6af915bee878bdaea04f48592bbbe506ad26':
  Method to show DialogFragment allowing state loss.

8 years agoMerge "Method to show DialogFragment allowing state loss." into mnc-dev
Jeff Sharkey [Fri, 14 Aug 2015 01:18:18 +0000 (01:18 +0000)]
Merge "Method to show DialogFragment allowing state loss." into mnc-dev

8 years agoam 37dd5240: Merge "Doc change: Update preview pages for dp3." into mnc-dev
Joe Fernandez [Fri, 14 Aug 2015 01:16:52 +0000 (01:16 +0000)]
am 37dd5240: Merge "Doc change: Update preview pages for dp3." into mnc-dev

* commit '37dd5240ad54494e028d6b2973729f5cb40ccad9':
  Doc change: Update preview pages for dp3.