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

200215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amit Mahajan
d2a4165ada am ebadc461: am dd8df041: Merge "Setting config_use_sim_language_file to false for 334-020." into mnc-dev 
* commit 'ebadc46132248edd175b9ae3b7f6312b97b822fe':
  Setting config_use_sim_language_file to false for 334-020.
 2015-08-17 23:28:15 +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
Selim Cinek
a6aa1fbd2b am d4d61826: Merge "Not allowing empty fingerprint names anymore" into mnc-dr-dev 
* commit 'd4d61826d0499d77c0501bd150b5f7395c94fd13':
  Not allowing empty fingerprint names anymore
 2015-08-17 22:43:22 +00: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
73ef464291 am 581fd0fb: am 757e2c7f: Merge "Fix documentation issue" into mnc-dev 
* commit '581fd0fb2ecbd6d9ee049bb08f395ec04709eb74':
  Fix documentation issue
 2015-08-17 22:05:30 +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
Joe Fernandez
811330ed18 am 1eb1f7cf: am 46ae218b: Merge "docs: Support Library v23 updates" into mnc-dev 
* commit '1eb1f7cf9be8e7491d6e676c12ce1fccd31ee479':
  docs: Support Library v23 updates
 2015-08-17 20:36:53 +00: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
76342acf89 am ed257d1a: am bd58d6fc: Doc change: misc fixes for preview 3. 
* commit 'ed257d1a3c7d94980e6fc1524a8e85f4e1d3959a':
  Doc change: misc fixes for preview 3.
 2015-08-17 20:03:59 +00: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
Bryce Lee
d74a66bd97 Merge "Introduce permission for updating the cell broadcast content provider." into cw-e-dev 2015-08-17 19:54:19 +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
Junda Liu
88c4e40636 am 150123a3: am f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev 
* commit '150123a37445dc778c30a466b6a69f575007c76d':
  Grant SMS carrier provisioning app the permission to receive SMS.
 2015-08-17 19:11:24 +00: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
Chris Tate
a0d4c9758c am 1a31af15: am a3fd27ad: Merge "Check component permissions like \'exported\' before assigned permissions" into mnc-dev 
* commit '1a31af15c14ddc241e6e0633be337f81dea20ad5':
  Check component permissions like 'exported' before assigned permissions
 2015-08-17 19:01:52 +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
Quddus Chong
101059b723 am aefae50d: am a03567bf: docs: Fixed unclosed anchor tag for M Program Overview. 
* commit 'aefae50d5e4d81601d52dce47e9be6e56834ccf3':
  docs: Fixed unclosed anchor tag for M Program Overview.
 2015-08-17 18:56:40 +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
f377bffb30 am a8f68d2d: am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev 
* commit 'a8f68d2da7733673d25fd1e5573539bf29b71ee4':
  docs: Updating the permissions docs for Preview 3.
 2015-08-17 17:45:46 +00:00
Ruben Brunk
3723af531a am c57f309a: Merge "Add experimental camera session prepare API." into mnc-dr-dev 
* commit 'c57f309a1b5be6fe9156405feb48637c036880a4':
  Add experimental camera session prepare API.
 2015-08-17 17:37:16 +00: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
2299478362 am 877c2257: Merge "instrument fingerprint service" into mnc-dr-dev 
* commit '877c22579e18736ee77d106ee2419ae99203bc9b':
  instrument fingerprint service
 2015-08-17 16:52:29 +00:00
Chris Wren
877c22579e Merge "instrument fingerprint service" into mnc-dr-dev 2015-08-17 16:47:55 +00:00
Quddus Chong
3449530c48 am ee222a7f: am ed7961eb: Merge "docs: Fixed typo in Android for Work section in MNC Behavior Changes doc." into mnc-dev 
* commit 'ee222a7f565e42b01f75b8fa63aa8a4912a4c944':
  docs: Fixed typo in Android for Work section in MNC Behavior Changes doc.
 2015-08-17 16:08:43 +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
Eric Gilmore
0b638fd211 am f3490b5f: am 9b3c0bc9: am 398d655f: am d381eb95: Merge "Adding link to location API video." into mnc-preview-docs 
* commit 'f3490b5f722f7d33df135aa161a0a41d31aaf3b9':
  Adding link to location API video.
 2015-08-17 15:56:12 +00:00
Rich Sloager
425bb3fbe6 am 8a4246b0: am 7f328d98: am 08b3f121: am 72c1f222: Merge "docs: studio 1.3.1 revision updates" into mnc-preview-docs 
* commit '8a4246b08fdbe231e0ead0a069608842404c2ecd':
  docs: studio 1.3.1 revision updates
 2015-08-17 15:56:08 +00:00
Rich Sloager
3fcd827232 am 99596170: am 50a16111: am 285c9cb7: am 4f66c1da: Merge "docs: studio 1.3.1 download updates" into mnc-preview-docs 
* commit '9959617046599e80b2a25c811e2c44dbcb3ddbf3':
  docs: studio 1.3.1 download updates
 2015-08-17 15:56:04 +00:00
Cheryl Potter
123bcea2a1 am c2d4a012: am a5913fbb: am a2f11f81: am caec50ec: docs: changed version 5 to 3 for Billing API 
* commit 'c2d4a012df35dca69dc4671301a4bfd6378b489a':
  docs: changed version 5 to 3 for Billing API
 2015-08-17 15:56:00 +00:00
Quddus Chong
fe1b532970 am 2788a5af: 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 th 
* commit '2788a5af216cb3af352119e37915ebf6afcc5f56':
  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:55:56 +00:00
Rich Sloager
d74ac1d532 am a09f35eb: am 96b2c10d: am 55ee752e: am c5b58011: Merge "docs: gradle plugin revision update" into mnc-preview-docs 
* commit 'a09f35ebc4c668800c6893edce00588a424bfe8e':
  docs: gradle plugin revision update
 2015-08-17 15:55:51 +00:00
Joe Fernandez
1d9cff6530 am 076eefa6: am f71cc012: am 9186895b: am 5fd0eff1: docs: August 2015 Android Dashboard update 
* commit '076eefa676321296c908ad0d236dc0dc644f4884':
  docs: August 2015 Android Dashboard update
 2015-08-17 15:55:46 +00:00
Rich Sloager
10ceae252c am 3b793ec5: am d00a5b1b: am 998f5501: am 378a3a89: Merge "docs: studio 1.3 annotation-update" into mnc-preview-docs 
* commit '3b793ec55cc9c6c61ac408e0279f2ff744ffa8b6':
  docs: studio 1.3 annotation-update
 2015-08-17 15:55:42 +00:00
Rich Slogar
eb7d99c23f am 26b379fc: am 43c8a1c8: am 3ee95327: am 6c00399c: docs: studio 1.3 private resources 
* commit '26b379fcf87b77c6b61bacc773d916fbee563860':
  docs: studio 1.3 private resources
 2015-08-17 15:55:38 +00:00
Rich Slogar
c8846fbd76 am 1b197f6c: am 1614f115: am 8f0d5451: am e5fe2468: docs: studio 1.3 allocation tracker 
* commit '1b197f6c24febccab55f4f1a899f0a03769e38a2':
  docs: studio 1.3 allocation tracker
 2015-08-17 15:55:34 +00:00
Rich Slogar
fd9a3e6b38 am 07116df2: am 605c890b: am 860e65be: am 16c5726e: docs: studio 1.3 developer services 
* commit '07116df26677c90a88536c22b5f3a42d8e69f080':
  docs: studio 1.3 developer services
 2015-08-17 15:55:30 +00:00
Rich Sloager
bc27540662 am 99a2f740: am 30996739: am e62df60a: am b90583ac: Merge "docs: create-project-link in studio overview" into mnc-preview-docs 
* commit '99a2f7404714c0d920feceb89984ae223049ab71':
  docs: create-project-link in studio overview
 2015-08-17 15:55:25 +00:00
Rich Sloager
0a373930bd am b9fe2732: am c6bfe586: am ccd0fe27: am c87ca50a: Merge "docs: studio 1.3 downloads" into mnc-preview-docs 
* commit 'b9fe2732a457158aad28822abe74f5f74eea6a30':
  docs: studio 1.3 downloads
 2015-08-17 15:55:20 +00:00