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

212349 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Tate
a3fd27adcc Merge "Check component permissions like 'exported' before assigned permissions" into mnc-dev 2015-08-17 18:01:15 +00:00
Andrew Solovay
8552b77c6f am f377bffb: am a8f68d2d: am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev 
* commit 'f377bffb30c78aaa5dd4188400a018a9febc2afd':
  docs: Updating the permissions docs for Preview 3.
 2015-08-17 17:54:30 +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
Ruben Brunk
6f4f94ae60 am 305680d6: am 3723af53: am c57f309a: Merge "Add experimental camera session prepare API." into mnc-dr-dev 
* commit '305680d6a08f6b44d71d7c83aebc557cfcbd3f85':
  Add experimental camera session prepare API.
 2015-08-17 17:51:42 +00: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
305680d6a0 am 3723af53: am c57f309a: Merge "Add experimental camera session prepare API." into mnc-dr-dev 
* commit '3723af531a2e5d9e90097460167d98cf8fc9975f':
  Add experimental camera session prepare API.
 2015-08-17 17:44:36 +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
Derek Sollenberger
deead00082 Merge "Add ninePatch support to Canvas.h" 2015-08-17 17:20:55 +00:00
Chris Wren
b247ba1ff5 am c1acc1df: am 5b37c0d8: am 22994783: am 877c2257: Merge "instrument fingerprint service" into mnc-dr-dev 
* commit 'c1acc1dfcea07cd9d78090c2aa90e93f91104729':
  instrument fingerprint service
 2015-08-17 17:16:15 +00:00
Chris Wren
c1acc1dfce am 5b37c0d8: am 22994783: am 877c2257: Merge "instrument fingerprint service" into mnc-dr-dev 
* commit '5b37c0d88c079f49602ff0bef5338e547658ef96':
  instrument fingerprint service
 2015-08-17 17:09:52 +00: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
5b37c0d88c am 22994783: am 877c2257: Merge "instrument fingerprint service" into mnc-dr-dev 
* commit '2299478362bfb5c0608dad083371b404124d9c89':
  instrument fingerprint service
 2015-08-17 17:02:03 +00: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
Alan Viverette
abd89024ac Merge "Manage accessibility focus during PhoneWindow save and restore" 2015-08-17 16:51:44 +00:00
Chris Wren
877c22579e Merge "instrument fingerprint service" into mnc-dr-dev 2015-08-17 16:47:55 +00:00
Seigo Nonaka
ce2c7849a0 Remove duplicate separator definition. 
INPUT_METHOD_SEPARATOR and INPUT_METHOD_SUBTYPE_SEPARATOR are defined in
both InputMethodUtils and InputMethodSettings with same value.
This CL removes definitions in InputMethodSettings and use SEPARATOR
instead of SEPARATER.

INPUT_METHOD_SEPARATOR and INPUT_METHOD_SUBTYPE_SEPARATOR in
InputMethodUtils are originally introduced to IMMS by
If0104151b3526da6ecc669adde3119a239ecafeb and they are moved to
InputMethodUtils by I01f5fafbbcfe3e3f5313829162ec011eaf2ad991.

INPUT_METHOD_SEPARATER and INPUT_METHOD_SUBTYPE_SEPARATER in
InputMethodSettings are originally introducced to IMMS as a part of
IMMS.InputMethodSettings by Icd0f13de396ce286ff6563e8c2775d53bcdacbf3
and InputMethodSettings is moved to InputMethodSettings by
I0bc9954f163a3ec38d08b9ba842a8a31176eb6a6

Bug: 22285167
Change-Id: I3601c10902b44bb639581e3b816a3fc0a4851957
 2015-08-17 16:47:21 +00:00
Chris Craik
31710114ba Merge "Make the value for shadowRadius less than 1.0 work" 2015-08-17 16:37:36 +00:00
Quddus Chong
3de880f838 am 58e2e14a: am 8f00f747: am 3449530c: am ee222a7f: am ed7961eb: Merge "docs: Fixed typo in Android for Work section in MNC Behavior Changes doc." into mnc-dev 
* commit '58e2e14a52cc4c25fce62f43ce5daf0dda557f9b':
  docs: Fixed typo in Android for Work section in MNC Behavior Changes doc.
 2015-08-17 16:36:08 +00:00
Eric Gilmore
cf80b224c9 am 102db534: am 375cd383: am 0b638fd2: am f3490b5f: am 9b3c0bc9: am 398d655f: am d381eb95: Merge "Adding link to location API video." into mnc-preview-docs 
* commit '102db534396ad73824d5b53f2242eb128a0d966d':
  Adding link to location API video.
 2015-08-17 16:35:58 +00:00
Rich Sloager
bd85a54b64 am 276009f5: am 1a3b04fa: am 425bb3fb: am 8a4246b0: am 7f328d98: am 08b3f121: am 72c1f222: Merge "docs: studio 1.3.1 revision updates" into mnc-preview-docs 
* commit '276009f5a1e3b1ad4a0571de43f91f638d7ec3d5':
  docs: studio 1.3.1 revision updates
 2015-08-17 16:35:50 +00:00
Rich Sloager
ba5295dd17 am 5762446f: am 11bfdbef: am 3fcd8272: am 99596170: am 50a16111: am 285c9cb7: am 4f66c1da: Merge "docs: studio 1.3.1 download updates" into mnc-preview-docs 
* commit '5762446fa254f4b2ff7f7b8819ef2a71834171c8':
  docs: studio 1.3.1 download updates
 2015-08-17 16:35:43 +00:00
Cheryl Potter
0c4b90dd61 am 3b519b23: am bd62289a: am 123bcea2: am c2d4a012: am a5913fbb: am a2f11f81: am caec50ec: docs: changed version 5 to 3 for Billing API 
* commit '3b519b236186a66ac70f8ebbf6a376a65905cde2':
  docs: changed version 5 to 3 for Billing API
 2015-08-17 16:35:34 +00:00
Quddus Chong
21d07bee4f am 5db0ec6e: am b1122b5a: am fe1b5329: 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 
* commit '5db0ec6ecf2ee163f290cc2a8d6d744e9f2a6be2':
  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 16:35:26 +00:00
Rich Sloager
64c65f922a am e346d617: am e592908b: am d74ac1d5: am a09f35eb: am 96b2c10d: am 55ee752e: am c5b58011: Merge "docs: gradle plugin revision update" into mnc-preview-docs 
* commit 'e346d617ff8725f83e6e4a019a977c8df4d6ef60':
  docs: gradle plugin revision update
 2015-08-17 16:35:20 +00:00
Joe Fernandez
6eaef0c329 am 6a316ff0: am b5b63a1c: am 1d9cff65: am 076eefa6: am f71cc012: am 9186895b: am 5fd0eff1: docs: August 2015 Android Dashboard update 
* commit '6a316ff0c1386d03027e98f39e8054d478f8076c':
  docs: August 2015 Android Dashboard update
 2015-08-17 16:35:12 +00:00
Rich Sloager
d607f7171f am 753d9aad: am f304ef8c: am 10ceae25: am 3b793ec5: am d00a5b1b: am 998f5501: am 378a3a89: Merge "docs: studio 1.3 annotation-update" into mnc-preview-docs 
* commit '753d9aad2740c7ea945da117fc139ec6b13c952a':
  docs: studio 1.3 annotation-update
 2015-08-17 16:35:03 +00:00
Rich Slogar
dbc1504508 am 767e6e7a: am b52b13dd: am eb7d99c2: am 26b379fc: am 43c8a1c8: am 3ee95327: am 6c00399c: docs: studio 1.3 private resources 
* commit '767e6e7acee2f33c28542475d8dcd3fc7ddbdd63':
  docs: studio 1.3 private resources
 2015-08-17 16:34:56 +00:00
Rich Slogar
5679bc2b30 am c1429ca9: am 1cb2d6b2: am c8846fbd: am 1b197f6c: am 1614f115: am 8f0d5451: am e5fe2468: docs: studio 1.3 allocation tracker 
* commit 'c1429ca95f334e0bde03c76993f870ff3d20bf42':
  docs: studio 1.3 allocation tracker
 2015-08-17 16:34:49 +00:00
Rich Slogar
0c0efeb43c am 88ee545e: am 376c79a9: am fd9a3e6b: am 07116df2: am 605c890b: am 860e65be: am 16c5726e: docs: studio 1.3 developer services 
* commit '88ee545e707d31873e4021bd4a8c44cc89e602d0':
  docs: studio 1.3 developer services
 2015-08-17 16:34:41 +00:00
Rich Sloager
711cc0a9ba am eab9263d: am 3a4200ec: am bc275406: am 99a2f740: am 30996739: am e62df60a: am b90583ac: Merge "docs: create-project-link in studio overview" into mnc-preview-docs 
* commit 'eab9263d4be3844a2db754de5ed83d6831bf7e6e':
  docs: create-project-link in studio overview
 2015-08-17 16:34:34 +00:00
Rich Sloager
ca8a62fbea am 66a44a22: am 3cc6b84f: am 0a373930: am b9fe2732: am c6bfe586: am ccd0fe27: am c87ca50a: Merge "docs: studio 1.3 downloads" into mnc-preview-docs 
* commit '66a44a220c9cc42e8e3e6518103d38ed8cb4b9a3':
  docs: studio 1.3 downloads
 2015-08-17 16:34:27 +00:00
Rich Sloager
41d0988343 am 4a65d739: am 8f5c409d: am c45a4f7a: am ea483d71: am 0ac81a6e: am fd8da61a: am f0cd0441: Merge "docs: studio 1.3 manifest merger update" into mnc-preview-docs 
* commit '4a65d739e04b0f6cbecf339a2c43f96e17bfe6a4':
  docs: studio 1.3 manifest merger update
 2015-08-17 16:34:18 +00:00
Rich Sloager
f1884aa097 am aad74803: am 7fb18f18: am bdb6bd8e: am c6ea82af: am 3cff3688: am 371ccd13: am 51c02f6a: Merge "docs: studio 1.3 revisions - android plugin for gradle" into mnc-preview-docs 
* commit 'aad74803ad661239e8f60132118aa0c514ec2b7d':
  docs: studio 1.3 revisions - android plugin for gradle
 2015-08-17 16:34:11 +00:00
Rich Sloager
ba1e6e1515 am e3dc6323: am 26aba634: am ea4afc6e: am 152f836b: am 110a5574: am f82f33d3: am 4c5b6cc4: Merge "docs: studio 1.3 live templates" into mnc-preview-docs 
* commit 'e3dc63238b9af6cbb1648cbd6925becd8288c055':
  docs: studio 1.3 live templates
 2015-08-17 16:34:04 +00:00
Rich Sloager
f97f972e47 am be8c6b3e: am d6cf72e4: am 0bbf06db: am 49246c83: am 7026df3b: am 5f8d3728: am b8987585: Merge "docs: studio 1.3 revisions - studio" into mnc-preview-docs 
* commit 'be8c6b3eef8d48952fd96a2ffa1cb9e5b9da41f5':
  docs: studio 1.3 revisions - studio
 2015-08-17 16:33:57 +00:00
Rich Sloager
d0e5442cce am ab3d5490: am 22c86c4a: am fcb11c12: am 32fd0933: am 7cbc35be: am c4fe8db7: am 322de02a: Merge "docs: studio 1.3 hprof viewer" into mnc-preview-docs 
* commit 'ab3d549007863415607e637194b25a820a48cbd3':
  docs: studio 1.3 hprof viewer
 2015-08-17 16:33:49 +00:00
Rich Sloager
58d17a9dc2 am 06ce8ee5: am 31fb3c5b: am b743065b: am b54cbb5d: am 1c6997b3: am 27b24602: am 47c88fca: Merge "docs: studio 1.3 separate test folder" into mnc-preview-docs 
* commit '06ce8ee5aea719690e0c96cc7259b313c24a33c9':
  docs: studio 1.3 separate test folder
 2015-08-17 16:33:42 +00:00
Rich Sloager
004be865be am d6650ee9: am fa716ea7: am 565513fc: am 6d663251: am ff7526c1: am 71178f02: am 29dfe902: Merge "docs: studio 1.3 fingerprint support" into mnc-preview-docs 
* commit 'd6650ee9c878f47a6daafb89f66925333930a4c5':
  docs: studio 1.3 fingerprint support
 2015-08-17 16:33:33 +00:00
Rich Sloager
af8d6a74da am 8873e691: am d9ccb88d: am 095d74ab: am f888d47c: am b4e5608d: am 57cdc011: am 054711b6: Merge "docs: studio 1.3 sdk manager updates" into mnc-preview-docs 
* commit '8873e691c213e66d8df1b51285a6df02b75d576a':
  docs: studio 1.3 sdk manager updates
 2015-08-17 16:33:25 +00:00
Rich Slogar
37b618a090 am 47ca7647: am bb627351: am 0dbae184: am b42f499e: am 1beefcad: am 7a76e44d: am 1f6a5f89: docs: design support library 22.2.1 revisions 
* commit '47ca7647b53124c003b13230ce9d7e05270d92cb':
  docs: design support library 22.2.1 revisions
 2015-08-17 16:33:18 +00:00
Andrew Solovay
32deca6b1c am 10b2792c: am 376d20cf: am 849897c9: am 9a94b442: am 8c6a2208: am 8a9972cc: am 803c5738: Merge "docs: Updated the list of auto partners, added links" into mnc-preview-docs 
* commit '10b2792ce31c828125dc7f9005ef7dfa312c69f1':
  docs: Updated the list of auto partners, added links
 2015-08-17 16:33:10 +00:00
Jason Monk
94ce8985b5 am b99fdbe8: am 6f07eaad: am cda0ab68: am 8cfbae04: Merge "Show usb charging notification when in host mode" into mnc-dr-dev 
* commit 'b99fdbe84568dea0cc019dc1e4a63bb40b4067d6':
  Show usb charging notification when in host mode
 2015-08-17 16:26:53 +00:00
Esteban Talavera
019a499c70 am 12e42ba2: am 31638de3: am 07b36bd3: am aed1c9fb: am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev 
* commit '12e42ba225cf6c38eaf752f55a22ce6296d2343c':
  Remove uids with empty history from NetworkStats uid enumeration
 2015-08-17 16:26:39 +00:00
Geoff Mendal
a2118c43b2 am d9617fe5: (-s ours) am 434770d5: (-s ours) am 5f5c4b23: (-s ours) am ea49b2f6: (-s ours) Import translations. DO NOT MERGE 
* commit 'd9617fe5b80f94a30efa7b38ec033bbad2023dfb':
  Import translations. DO NOT MERGE
 2015-08-17 16:26:27 +00:00
Chris Banes
9bc414a254 am be0a8553: am 5adb4de3: am 46888bbc: am 0c636b0f: am 4fd784e1: Merge "Add Support Lib v23 API Diff" into mnc-dev 
* commit 'be0a85535568e3b9b4ad66d82229669e9f4307c0':
  Add Support Lib v23 API Diff
 2015-08-17 16:26:09 +00:00
Joe Fernandez
b2e8e9310f am f4568bd1: am f21c2e2b: am e3cd66eb: am b0514a0c: am 70004d9f: docs: fix build errors due to linked apache http classes 
* commit 'f4568bd1d9ef84bac051771c0c2e2d3f8bb10b74':
  docs: fix build errors due to linked apache http classes
 2015-08-17 16:25:52 +00:00
Quddus Chong
0935eaa101 am 96e90e4f: am 5935fbd3: am bf14237d: am 7f64fa51: am 28f2ba8e: docs: Remove Google Play Services pages under Develop > Google Services. 
* commit '96e90e4fbdbb403b9affc4680a9a7a067a73c1ab':
  docs: Remove Google Play Services pages under Develop > Google Services.
 2015-08-17 16:25:43 +00:00