OSDN Git Service

android-x86/frameworks-base.git
8 years agoam aed1c9fb: am 5d467ac5: Merge "Remove uids with empty history from NetworkStats...
Esteban Talavera [Mon, 17 Aug 2015 15:00:04 +0000 (15:00 +0000)]
am aed1c9fb: am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev

* commit 'aed1c9fbc5c4f77bfc8c44fb7bd87bbdb6dc0174':
  Remove uids with empty history from NetworkStats uid enumeration

8 years agoam 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration...
Esteban Talavera [Mon, 17 Aug 2015 14:53:53 +0000 (14:53 +0000)]
am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev

* commit '5d467ac54ab0390d6b911628d56294bb4277d2f1':
  Remove uids with empty history from NetworkStats uid enumeration

8 years agoMerge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev
Esteban Talavera [Mon, 17 Aug 2015 14:47:49 +0000 (14:47 +0000)]
Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev

8 years agoam ea49b2f6: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Aug 2015 14:02:21 +0000 (14:02 +0000)]
am ea49b2f6: (-s ours) Import translations. DO NOT MERGE

* commit 'ea49b2f6e822924c7e5ebcaf1b7bac4a2e54fd6b':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Aug 2015 13:52:31 +0000 (06:52 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iaffcfead62c6ca52dafd9e5776c65272851076cf
Auto-generated-cl: translation import

8 years agoam 0c636b0f: am 4fd784e1: Merge "Add Support Lib v23 API Diff" into mnc-dev
Chris Banes [Mon, 17 Aug 2015 09:49:37 +0000 (09:49 +0000)]
am 0c636b0f: am 4fd784e1: Merge "Add Support Lib v23 API Diff" into mnc-dev

* commit '0c636b0f34d6efbc8b0c45e4ac5e623ccb9f69b6':
  Add Support Lib v23 API Diff

8 years agoam 4fd784e1: Merge "Add Support Lib v23 API Diff" into mnc-dev
Chris Banes [Mon, 17 Aug 2015 09:43:44 +0000 (09:43 +0000)]
am 4fd784e1: Merge "Add Support Lib v23 API Diff" into mnc-dev

* commit '4fd784e15228fb208368869b7190d5dfb9b6f95b':
  Add Support Lib v23 API Diff

8 years agoMerge "Add Support Lib v23 API Diff" into mnc-dev
Chris Banes [Mon, 17 Aug 2015 08:27:07 +0000 (08:27 +0000)]
Merge "Add Support Lib v23 API Diff" into mnc-dev

8 years agoam b0514a0c: am 70004d9f: docs: fix build errors due to linked apache http classes
Joe Fernandez [Mon, 17 Aug 2015 05:23:58 +0000 (05:23 +0000)]
am b0514a0c: am 70004d9f: docs: fix build errors due to linked apache http classes

* commit 'b0514a0cd85228ee30486db4b64e95434bf364fb':
  docs: fix build errors due to linked apache http classes

8 years agoam 70004d9f: docs: fix build errors due to linked apache http classes
Joe Fernandez [Mon, 17 Aug 2015 05:14:03 +0000 (05:14 +0000)]
am 70004d9f: docs: fix build errors due to linked apache http classes

* commit '70004d9f4c80d3dfc9d37ff1fe4c2f859e0849a7':
  docs: fix build errors due to linked apache http classes

8 years agodocs: fix build errors due to linked apache http classes
Joe Fernandez [Mon, 17 Aug 2015 05:01:31 +0000 (22:01 -0700)]
docs: fix build errors due to linked apache http classes

- apache.http packages have been dropped in mnc-dev, causing build errors

Change-Id: I3bcfe0e9a6ecfb20b27df1712e2e527f6af85982

8 years agoam 7f64fa51: am 28f2ba8e: docs: Remove Google Play Services pages under Develop ...
Quddus Chong [Mon, 17 Aug 2015 04:44:28 +0000 (04:44 +0000)]
am 7f64fa51: am 28f2ba8e: docs: Remove Google Play Services pages under Develop > Google Services.

* commit '7f64fa515525b0b21f6f212584550fd9e813c145':
  docs: Remove Google Play Services pages under Develop > Google Services.

8 years agoam 28f2ba8e: docs: Remove Google Play Services pages under Develop > Google Services.
Quddus Chong [Mon, 17 Aug 2015 04:37:32 +0000 (04:37 +0000)]
am 28f2ba8e: docs: Remove Google Play Services pages under Develop > Google Services.

* commit '28f2ba8e30d774859b38e91a3f1ab91e31a69caf':
  docs: Remove Google Play Services pages under Develop > Google Services.

8 years agodocs: Remove Google Play Services pages under Develop > Google Services.
Quddus Chong [Tue, 26 May 2015 21:21:05 +0000 (14:21 -0700)]
docs: Remove Google Play Services pages under Develop > Google Services.

Cherry-pick from Change-Id: I392075b58bebc5556f306c2d20987811efe90b13

Change-Id: I17ad018a0875b653c0706fd9bbe5f637760cdfbc

8 years agoam e9b48d70: am 85429c0d: docs: Android 5.1 API Release notes (Lollipop MR1)
Joe Fernandez [Mon, 17 Aug 2015 04:18:22 +0000 (04:18 +0000)]
am e9b48d70: am 85429c0d: docs: Android 5.1 API Release notes (Lollipop MR1)

* commit 'e9b48d7001ef48b1976a447e966af8014e293fbd':
  docs: Android 5.1 API Release notes (Lollipop MR1)

8 years agoam 85429c0d: docs: Android 5.1 API Release notes (Lollipop MR1)
Joe Fernandez [Mon, 17 Aug 2015 04:11:51 +0000 (04:11 +0000)]
am 85429c0d: docs: Android 5.1 API Release notes (Lollipop MR1)

* commit '85429c0d9476502afdcc66c0379fde632d8e5863':
  docs: Android 5.1 API Release notes (Lollipop MR1)

8 years agoam b447316a: am 637db47e: docs: SDK Tools v23.3.4 release download links
Joe Fernandez [Mon, 17 Aug 2015 04:03:37 +0000 (04:03 +0000)]
am b447316a: am 637db47e: docs: SDK Tools v23.3.4 release download links

* commit 'b447316acc0ffff412564cef205fc468818a439f':
  docs: SDK Tools v23.3.4 release download links

8 years agodocs: Android 5.1 API Release notes (Lollipop MR1)
Joe Fernandez [Fri, 27 Feb 2015 05:55:07 +0000 (21:55 -0800)]
docs: Android 5.1 API Release notes (Lollipop MR1)

Cherry pick from Change-Id: I47f59ade26086b8368d8b395f92992edc27510d0

Change-Id: I47f59ade26086b8368d8b395f92992edc27510d0

8 years agoam 637db47e: docs: SDK Tools v23.3.4 release download links
Joe Fernandez [Mon, 17 Aug 2015 03:59:52 +0000 (03:59 +0000)]
am 637db47e: docs: SDK Tools v23.3.4 release download links

* commit '637db47e520f87565227b00eff67435425b5eabc':
  docs: SDK Tools v23.3.4 release download links

8 years agodocs: SDK Tools v23.3.4 release download links
Joe Fernandez [Mon, 17 Aug 2015 03:51:29 +0000 (20:51 -0700)]
docs: SDK Tools v23.3.4 release download links

- SDK tools update for Android 6.0 (API level 23) and M Preview 3

Change-Id: I32134f632d4a53162cab61237f1c50cba7d6bd71

8 years agoam a4d1e7e0: am 0baf95bf: docs: SDK Tools Release notes for v24.3.4
Joe Fernandez [Mon, 17 Aug 2015 03:37:59 +0000 (03:37 +0000)]
am a4d1e7e0: am 0baf95bf: docs: SDK Tools Release notes for v24.3.4

* commit 'a4d1e7e0abe006465526b3b31d5024ae97ad50fe':
  docs: SDK Tools Release notes for v24.3.4

8 years agoam 0baf95bf: docs: SDK Tools Release notes for v24.3.4
Joe Fernandez [Mon, 17 Aug 2015 03:31:35 +0000 (03:31 +0000)]
am 0baf95bf: docs: SDK Tools Release notes for v24.3.4

* commit '0baf95bfdb60de76037fa527964313645cd85f15':
  docs: SDK Tools Release notes for v24.3.4

8 years agodocs: SDK Tools Release notes for v24.3.4
Joe Fernandez [Fri, 14 Aug 2015 19:22:43 +0000 (12:22 -0700)]
docs: SDK Tools Release notes for v24.3.4

- Support for API 23
- Emulator fixes (multi-core, GPU emulation support and fixes)

Change-Id: Id5a89906e14a4393ddd8d201a8b1e45d1ec60cc3

8 years agoam 5e9de544: am 472b6b44: docs: Platform release notes for Android 6.0 (API 23) revis...
Joe Fernandez [Mon, 17 Aug 2015 03:16:23 +0000 (03:16 +0000)]
am 5e9de544: am 472b6b44: docs: Platform release notes for Android 6.0 (API 23) revision 1

* commit '5e9de544f1c301ae657eb0ea3651c724fbf0274b':
  docs: Platform release notes for Android 6.0 (API 23) revision 1

8 years agoam 472b6b44: docs: Platform release notes for Android 6.0 (API 23) revision 1
Joe Fernandez [Mon, 17 Aug 2015 03:08:00 +0000 (03:08 +0000)]
am 472b6b44: docs: Platform release notes for Android 6.0 (API 23) revision 1

* commit '472b6b4480c39e9f76449c7ef566e0d76fdf118d':
  docs: Platform release notes for Android 6.0 (API 23) revision 1

8 years agodocs: Platform release notes for Android 6.0 (API 23) revision 1
Joe Fernandez [Fri, 14 Aug 2015 18:13:54 +0000 (11:13 -0700)]
docs: Platform release notes for Android 6.0 (API 23) revision 1

doc update to coincide with the release of M Preview 3

Change-Id: Ib33939f24d4499b3d1e4deb37807fa9e9a1f8d0c

8 years agoam 0051cbac: am 6a3016d2: Merge "docs: Build Tools 23.0.0 release notes" into mnc-dev
Joe Fernandez [Mon, 17 Aug 2015 02:05:11 +0000 (02:05 +0000)]
am 0051cbac: am 6a3016d2: Merge "docs: Build Tools 23.0.0 release notes" into mnc-dev

* commit '0051cbac3f3c2ddd5c4b8347096543b808c9adeb':
  docs: Build Tools 23.0.0 release notes

8 years agoam 6a3016d2: Merge "docs: Build Tools 23.0.0 release notes" into mnc-dev
Joe Fernandez [Mon, 17 Aug 2015 01:56:42 +0000 (01:56 +0000)]
am 6a3016d2: Merge "docs: Build Tools 23.0.0 release notes" into mnc-dev

* commit '6a3016d2a77da45ff903f2883f42e52b4dcecdfb':
  docs: Build Tools 23.0.0 release notes

8 years agoMerge "docs: Build Tools 23.0.0 release notes" into mnc-dev
Joe Fernandez [Mon, 17 Aug 2015 01:52:05 +0000 (01:52 +0000)]
Merge "docs: Build Tools 23.0.0 release notes" into mnc-dev

8 years agoam 2aa5b510: am bd4ed32f: docs: Preview 3 - Support page updates
Joe Fernandez [Mon, 17 Aug 2015 01:12:11 +0000 (01:12 +0000)]
am 2aa5b510: am bd4ed32f: docs: Preview 3 - Support page updates

* commit '2aa5b51062a3deecb7f8d57dd3bde1bd979b7224':
  docs: Preview 3 - Support page updates

8 years agoam bd4ed32f: docs: Preview 3 - Support page updates
Joe Fernandez [Mon, 17 Aug 2015 01:06:57 +0000 (01:06 +0000)]
am bd4ed32f: docs: Preview 3 - Support page updates

* commit 'bd4ed32ffa25e860b6212cff31510c801fffc39f':
  docs: Preview 3 - Support page updates

8 years agodocs: Preview 3 - Support page updates
Joe Fernandez [Sun, 16 Aug 2015 23:56:02 +0000 (16:56 -0700)]
docs: Preview 3 - Support page updates

- Add Key changes
- Add Known issues

Change-Id: I080b191a6609a4216e7521afa951b53f33609b90

8 years agoam 3c315c90: am 42c22d04: Merge "Doc change: Edits for final SDK and dev preview...
Dirk Dougherty [Mon, 17 Aug 2015 00:06:23 +0000 (00:06 +0000)]
am 3c315c90: am 42c22d04: Merge "Doc change: Edits for final SDK and dev preview 3. Add selector to manage landing page image." into mnc-dev

* commit '3c315c90195088ea01e86e44ebdb252e7b80f05f':
  Doc change: Edits for final SDK and dev preview 3. Add selector to manage landing page image.

8 years agoam 33c9c52f: am bf8f17f8: docs: Update Preview downloads page for Developer Preview 3
Joe Fernandez [Mon, 17 Aug 2015 00:06:20 +0000 (00:06 +0000)]
am 33c9c52f: am bf8f17f8: docs: Update Preview downloads page for Developer Preview 3

* commit '33c9c52f57dcb32d5afdb1171bca1f1439b2cf5c':
  docs: Update Preview downloads page for Developer Preview 3

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 42c22d04: Merge "Doc change: Edits for final SDK and dev preview 3. Add selector...
Dirk Dougherty [Sun, 16 Aug 2015 23:57:51 +0000 (23:57 +0000)]
am 42c22d04: Merge "Doc change: Edits for final SDK and dev preview 3. Add selector to manage landing page image." into mnc-dev

* commit '42c22d04d9be578c4f32adfd43c1b37816a5c150':
  Doc change: Edits for final SDK and dev preview 3. Add selector to manage landing page image.

8 years agoam bf8f17f8: docs: Update Preview downloads page for Developer Preview 3
Joe Fernandez [Sun, 16 Aug 2015 23:57:47 +0000 (23:57 +0000)]
am bf8f17f8: docs: Update Preview downloads page for Developer Preview 3

* commit 'bf8f17f8dcfa0b923d7a8e16d85b09d61fdc39b9':
  docs: Update Preview downloads page for Developer Preview 3

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 "Doc change: Edits for final SDK and dev preview 3. Add selector to manage...
Dirk Dougherty [Sun, 16 Aug 2015 22:26:03 +0000 (22:26 +0000)]
Merge "Doc change: Edits for final SDK and dev preview 3. Add selector to manage landing page image." into mnc-dev

8 years agoDoc change: Edits for final SDK and dev preview 3. Add selector to manage landing...
Dirk Dougherty [Sun, 16 Aug 2015 19:55:29 +0000 (12:55 -0700)]
Doc change: Edits for final SDK and dev preview 3. Add selector to manage landing page image.

Change-Id: I9afddbea9ae27bad236a0aff8cc373cb1baea5a4

8 years agodocs: Update Preview downloads page for Developer Preview 3
Joe Fernandez [Sun, 16 Aug 2015 21:54:03 +0000 (14:54 -0700)]
docs: Update Preview downloads page for Developer Preview 3

- System image downloads for Preview 3
- Preview 3 documentation download

Change-Id: I6a0daee44a1e8bd3421b0918daf72aff97b86e4c

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 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 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 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 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 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 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