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

199276 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Tate
b16cd62c67 am c0a2254e: Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev 
* commit 'c0a2254e083f7d2f38052012363cd71d1a6657dc':
  Clean up properly if outcall for doRestoreFinished() fails
 2015-08-18 01:13:24 +00:00
Chris Tate
c0a2254e08 Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev 2015-08-18 01:07:50 +00:00
Quddus Chong
0c61fe7606 am 7aa6fc67: Merge "docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev 
* commit '7aa6fc67d7c1c02cd2e99e8d94b4c0b8918c4d3f':
  docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.
 2015-08-17 23:48:02 +00:00
Joe Fernandez
0805fcc311 am 036895e1: Merge "docs: M Preview 3 post-release cleanup" into mnc-dev 
* commit '036895e1f18539d49496ea38592d0b1f9456efd1':
  docs: M Preview 3 post-release cleanup
 2015-08-17 23:40:15 +00:00
Quddus Chong
7aa6fc67d7 Merge "docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev 2015-08-17 23:38:56 +00:00
Joe Fernandez
036895e1f1 Merge "docs: M Preview 3 post-release cleanup" into mnc-dev 2015-08-17 23:30:07 +00:00
Amit Mahajan
ebadc46132 am dd8df041: Merge "Setting config_use_sim_language_file to false for 334-020." into mnc-dev 
* commit 'dd8df0418ee4a873efd66ada577c5a2b21b3de5d':
  Setting config_use_sim_language_file to false for 334-020.
 2015-08-17 23:21:25 +00:00
Amit Mahajan
dd8df0418e Merge "Setting config_use_sim_language_file to false for 334-020." into mnc-dev 2015-08-17 23:06:13 +00:00
Joe Fernandez
c45bd6930b docs: M Preview 3 post-release cleanup 
- Add BTLE and Wi-Fi scan permissions change
- Add link to Support library v23 differences report
- Added known issue about Work Profiles not working in MPA44G images

Change-Id: Ica5643b1f9b6980520fd2650dcbab5d88d264127
 2015-08-17 15:39:35 -07:00
Selim Cinek
d4d61826d0 Merge "Not allowing empty fingerprint names anymore" into mnc-dr-dev 2015-08-17 22:34:40 +00:00
Jorim Jaggi
581fd0fb2e am 757e2c7f: Merge "Fix documentation issue" into mnc-dev 
* commit '757e2c7f3e6ee93c69ecdd9de18fc03eff72d00e':
  Fix documentation issue
 2015-08-17 21:58:51 +00:00
Jorim Jaggi
757e2c7f3e Merge "Fix documentation issue" into mnc-dev 2015-08-17 21:51:47 +00:00
Quddus Chong
db87d7cd9e docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery. 
Change-Id: I872bbb5069418a4dfb174dda5dd9e86b833f7894
 2015-08-17 14:28:32 -07:00
Joe Fernandez
1eb1f7cf9b am 46ae218b: Merge "docs: Support Library v23 updates" into mnc-dev 
* commit '46ae218b2aeab9e92d59b3d074cc43d696be11d5':
  docs: Support Library v23 updates
 2015-08-17 20:27:41 +00:00
Joe Fernandez
46ae218b2a Merge "docs: Support Library v23 updates" into mnc-dev 2015-08-17 20:22:15 +00:00
Rich Slogar
f0a340e0fe docs: Support Library v23 updates 
Change-Id: I0f5b6109d907e9bb29bd500eb852a031f8952287
 2015-08-17 13:21:00 -07:00
Dirk Dougherty
ed257d1a3c am bd58d6fc: Doc change: misc fixes for preview 3. 
* commit 'bd58d6fcadad111cee35778a4f77c4f789a0f8c6':
  Doc change: misc fixes for preview 3.
 2015-08-17 19:56:28 +00:00
Dirk Dougherty
bd58d6fcad Doc change: misc fixes for preview 3. 
Change-Id: Ib389f3db0e38f13d2634fda9e893c1dd87dcd6fc
 2015-08-17 12:27:34 -07:00
Selim Cinek
d9d530216f Not allowing empty fingerprint names anymore 
Bug: 22497103
Change-Id: I638b1db5b614f5ea9bf8e3566bf4619a3249d391
 2015-08-17 12:20:00 -07:00
Christopher Tate
d71d7c350c Clean up properly if outcall for doRestoreFinished() fails 
The target app crashed at an inopportune time but this shouldn't
invalidate the whole ongoing restore operation; it's a problem local to
the specific app undergoing restore.  Recognize this, clean up the app's
possibly-incomplete data, and continue running the restore queue as
planned.

Bug 23228982

Change-Id: If9a19d2fe6a0ce5339c893630d7a61a5a5ccd9b1
 2015-08-17 12:16:19 -07:00
Junda Liu
150123a374 am f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev 
* commit 'f2cb6f7e3ea143ba4acace0821c9d49e363da7eb':
  Grant SMS carrier provisioning app the permission to receive SMS.
 2015-08-17 19:03:58 +00:00
Junda Liu
f2cb6f7e3e Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev 2015-08-17 18:58:19 +00:00
Chris Tate
1a31af15c1 am a3fd27ad: Merge "Check component permissions like \'exported\' before assigned permissions" into mnc-dev 
* commit 'a3fd27adcc655dd9566d72f290ac343704e8e4db':
  Check component permissions like 'exported' before assigned permissions
 2015-08-17 18:55:24 +00:00
Quddus Chong
aefae50d5e am a03567bf: docs: Fixed unclosed anchor tag for M Program Overview. 
* commit 'a03567bfe0b2f71263e5facd0edc908bf43965cc':
  docs: Fixed unclosed anchor tag for M Program Overview.
 2015-08-17 18:47:52 +00:00
Jorim Jaggi
9b70f44b2a Fix documentation issue 
Bug: 23038621
Change-Id: I230e09564b619868a4d22b2945c97180796ff4b1
 2015-08-17 18:45:22 +00:00
Chris Tate
a3fd27adcc Merge "Check component permissions like 'exported' before assigned permissions" into mnc-dev 2015-08-17 18:01:15 +00:00
Quddus Chong
a03567bfe0 docs: Fixed unclosed anchor tag for M Program Overview. 
Change-Id: I632e999c0d32acbf5c5fce5377603069fea312f0
 2015-08-17 10:53:10 -07:00
Andrew Solovay
a8f68d2da7 am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev 
* commit 'af46e1b404c1d4fea17a24e5a49f23a7d0c982f7':
  docs: Updating the permissions docs for Preview 3.
 2015-08-17 17:35:05 +00:00
Ruben Brunk
c57f309a1b Merge "Add experimental camera session prepare API." into mnc-dr-dev 2015-08-17 17:28:12 +00:00
Christopher Tate
ff7add011a Check component permissions like 'exported' before assigned permissions 
In particular, don't assume that the absence of an explicit permission
requirement means that the activity is freely launchable unless you have
also checked thing like exported="true" first.

Bug 23223804

Change-Id: Idbfd1f5662b374a7a447b738591b267a1c497e41
 2015-08-17 10:25:27 -07:00
Andrew Solovay
af46e1b404 resolved conflicts for merge of 44053b4e to mnc-dev 
Change-Id: Ibe58da3f0b18bce138b9d8880bccfe61ebc0b2cf
 2015-08-17 10:06:26 -07:00
Chris Wren
877c22579e Merge "instrument fingerprint service" into mnc-dr-dev 2015-08-17 16:47:55 +00:00
Quddus Chong
ee222a7f56 am ed7961eb: Merge "docs: Fixed typo in Android for Work section in MNC Behavior Changes doc." into mnc-dev 
* commit 'ed7961eb5a1fceabf30a8f790c8dc37ae714db51':
  docs: Fixed typo in Android for Work section in MNC Behavior Changes doc.
 2015-08-17 16:03:53 +00:00
Quddus Chong
ed7961eb5a Merge "docs: Fixed typo in Android for Work section in MNC Behavior Changes doc." into mnc-dev 2015-08-17 15:55:02 +00:00
Eric Gilmore
f3490b5f72 am 9b3c0bc9: am 398d655f: am d381eb95: Merge "Adding link to location API video." into mnc-preview-docs 
* commit '9b3c0bc91aa5a40fd53e282a70f606c3af510f93':
  Adding link to location API video.
 2015-08-17 15:48:44 +00:00
Rich Sloager
8a4246b08f am 7f328d98: am 08b3f121: am 72c1f222: Merge "docs: studio 1.3.1 revision updates" into mnc-preview-docs 
* commit '7f328d98d94217b57d167318548a85befcac4139':
  docs: studio 1.3.1 revision updates
 2015-08-17 15:48:40 +00:00
Rich Sloager
9959617046 am 50a16111: am 285c9cb7: am 4f66c1da: Merge "docs: studio 1.3.1 download updates" into mnc-preview-docs 
* commit '50a161114fa87d0907f901f3b3e5378e0bdbe750':
  docs: studio 1.3.1 download updates
 2015-08-17 15:48:35 +00:00
Cheryl Potter
c2d4a012df am a5913fbb: am a2f11f81: am caec50ec: docs: changed version 5 to 3 for Billing API 
* commit 'a5913fbb6b6f967ba3dad291d5462807911eedf0':
  docs: changed version 5 to 3 for Billing API
 2015-08-17 15:48:30 +00:00
Quddus Chong
2788a5af21 am 3f90a43c: am 98d2d0d5: am 862f0f03: doc: Updated Auto quality guideline for media playback (AU-MT). The update reflects new guidance that media apps do not autoplay on startup of Android Auto or without user initiated action to select the app or app 
* commit '3f90a43cd9e3cfcad03fc0e280709f19553295fe':
  doc: Updated Auto quality guideline for media playback (AU-MT).      The update reflects new guidance that media apps do      not autoplay on startup of Android Auto or without      user initiated action to select the app or app media. bugs: 22932742
 2015-08-17 15:48:25 +00:00
Rich Sloager
a09f35ebc4 am 96b2c10d: am 55ee752e: am c5b58011: Merge "docs: gradle plugin revision update" into mnc-preview-docs 
* commit '96b2c10dd119593c9cc54ceb0e9a44883cd5885c':
  docs: gradle plugin revision update
 2015-08-17 15:48:21 +00:00
Joe Fernandez
076eefa676 am f71cc012: am 9186895b: am 5fd0eff1: docs: August 2015 Android Dashboard update 
* commit 'f71cc012ff3c6b0c304ae084eface2ed72784b20':
  docs: August 2015 Android Dashboard update
 2015-08-17 15:48:16 +00:00
Rich Sloager
3b793ec55c am d00a5b1b: am 998f5501: am 378a3a89: Merge "docs: studio 1.3 annotation-update" into mnc-preview-docs 
* commit 'd00a5b1b6fdd0d8fc3226324fa4789237af5527b':
  docs: studio 1.3 annotation-update
 2015-08-17 15:48:12 +00:00
Rich Slogar
26b379fcf8 am 43c8a1c8: am 3ee95327: am 6c00399c: docs: studio 1.3 private resources 
* commit '43c8a1c8a66302f17d83c7d38d19d41e2e26b32f':
  docs: studio 1.3 private resources
 2015-08-17 15:48:07 +00:00
Rich Slogar
1b197f6c24 am 1614f115: am 8f0d5451: am e5fe2468: docs: studio 1.3 allocation tracker 
* commit '1614f115c38c68d49a74c2553a68a46bd2f4c913':
  docs: studio 1.3 allocation tracker
 2015-08-17 15:48:00 +00:00
Rich Slogar
07116df266 am 605c890b: am 860e65be: am 16c5726e: docs: studio 1.3 developer services 
* commit '605c890bf0e01235bb538c9175495830e77f0783':
  docs: studio 1.3 developer services
 2015-08-17 15:47:56 +00:00
Rich Sloager
99a2f74047 am 30996739: am e62df60a: am b90583ac: Merge "docs: create-project-link in studio overview" into mnc-preview-docs 
* commit '309967393a436e28e695b7f44a1cb9d051013255':
  docs: create-project-link in studio overview
 2015-08-17 15:47:52 +00:00
Rich Sloager
b9fe2732a4 am c6bfe586: am ccd0fe27: am c87ca50a: Merge "docs: studio 1.3 downloads" into mnc-preview-docs 
* commit 'c6bfe58697bc0055d493917240f0e74aa73eae08':
  docs: studio 1.3 downloads
 2015-08-17 15:47:46 +00:00
Rich Sloager
ea483d7154 am 0ac81a6e: am fd8da61a: am f0cd0441: Merge "docs: studio 1.3 manifest merger update" into mnc-preview-docs 
* commit '0ac81a6e14ce25f93520039bb10033469791e6d9':
  docs: studio 1.3 manifest merger update
 2015-08-17 15:47:38 +00:00
Rich Sloager
c6ea82af58 am 3cff3688: am 371ccd13: am 51c02f6a: Merge "docs: studio 1.3 revisions - android plugin for gradle" into mnc-preview-docs 
* commit '3cff3688d93d26b0f73755dc61d1cda1ffbb3306':
  docs: studio 1.3 revisions - android plugin for gradle
 2015-08-17 15:47:33 +00:00
Rich Sloager
152f836b10 am 110a5574: am f82f33d3: am 4c5b6cc4: Merge "docs: studio 1.3 live templates" into mnc-preview-docs 
* commit '110a55749af8c4190e39358e6d6be43cfad81ed3':
  docs: studio 1.3 live templates
 2015-08-17 15:47:28 +00:00