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

95306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
da38ddc26f am f9ed7dc9: am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes. 
* commit 'f9ed7dc96a242d2c583065dfb31a8dafc7825bd0':
 2013-03-05 13:03:34 -08:00
Scott Main
9daf107d92 am 10dda9ca: am 00158363: docs: add bdc\'s security doc as training article 
* commit '10dda9ca64e0d777709f7a9a6b9cae4f94a955f7':
 2013-03-05 13:03:32 -08:00
Dirk Dougherty
e1d8df4536 am f80cb186: am 1c7b442a: Merge "Doc change: update \'multiple apks\' criteria in filters doc." into jb-mr1-dev 
* commit 'f80cb1869e6db8168379d92c81689b486a493c0b':
 2013-03-05 13:03:30 -08:00
Scott Main
fbd852bacc am 9ecd8e7b: am d346b311: Merge "docs: add MTK usb driver info" into jb-mr1-dev 
* commit '9ecd8e7ba1aec4d6edc75f6ae91db04613e6256f':
 2013-03-05 13:03:27 -08:00
Scott Main
0f1259ccb7 am 8c82d250: Merge "docs: clarify startActivity" into jb-mr1.1-docs 
* commit '8c82d250723a2ae8f384c6602424a38a1ca101eb':
  docs: clarify startActivity
 2013-03-05 13:03:25 -08:00
quddusc
096c7f7b64 am f353c9ed: Merge "docs: Fix IABv3 AIDL installation instructions for Eclipse users. Bug: 8282080" into jb-mr1.1-docs 
* commit 'f353c9ed7d0eb59c0663639f2800c5c4e542386c':
  docs: Fix IABv3 AIDL installation instructions for Eclipse users. Bug: 8282080
 2013-03-05 13:03:22 -08:00
Dirk Dougherty
3f52bde0c3 am 694602ae: am d9019dd2: Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering. 
* commit '694602aebc4e398c01a8d6c795cd6ad801f8eecf':
 2013-03-05 13:03:20 -08:00
Scott Main
45c5288cf8 am 8da34d97: am 9d167eaa: docs: another string change for developer console bug: 8033647 
* commit '8da34d97868c888b3f8aa230627ab3b2b87d8d11':
 2013-03-05 13:03:17 -08:00
Scott Main
b3ff35adc5 am 06706ba5: am 2d0b481f: docs: followup to I32f25b692872ed7827e611890c563498993b2480 
* commit '06706ba5d66d5c5d937750868be0eecb8ed9b43b':
 2013-03-05 13:03:15 -08:00
Jean-Baptiste Queru
18cd97931c am 84d3036c: (-s ours) am ed9cc555: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '84d3036cf9ee03e118b4cfa857d574e5d3684c98':
 2013-03-05 13:03:13 -08:00
Dirk Dougherty
a0c2afbd63 am bde26777: am 012ef92e: Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 
* commit 'bde267772d42cddf091ebcc2f18d95977ec6f9a5':
 2013-03-05 13:03:10 -08:00
Robert Ly
bd18140128 am 9d09eee5: am af7b843e: docs: remove games references 
* commit '9d09eee559533535e00be933a38a69ade046d74e':
 2013-03-05 13:03:07 -08:00
Robert Ly
0e4e61f1d5 am 1878d080: am 7cbf2bc6: Merge "docs: gms cheddar updates for g+" into jb-mr1-dev 
* commit '1878d08046784517d3eedd47993e4a4f8c9a98bd':
 2013-03-05 13:03:05 -08:00
Robert Ly
bc382d06d9 am 82370a60: am 05c8e63c: docs: gms and gcm javadocs 
* commit '82370a60b2eac88fd763093eba61e45326892a41':
 2013-03-05 13:03:02 -08:00
Joe Malin
7865c6f041 am e35ae88b: am 06764394: Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev 
* commit 'e35ae88b3e9ac28a19c35b8982a07c877e235f68':
 2013-03-05 13:03:00 -08:00
Scott Main
552ac879ab am cdc57997: am d51eebae: docs: add google io registration announcement to home page 
* commit 'cdc579973440b2a5d75c095b1cf4e12c1818f1d3':
 2013-03-05 13:02:57 -08:00
Dirk Dougherty
ed40f2a681 am 2caba1f7: am f15b0908: Merge "fix javadocs" into jb-mr1-dev 
* commit '2caba1f763faf0656e2f27a9a422ada5908488c2':
 2013-03-05 13:02:55 -08:00
Adam Koch
ae35154120 am f64fd772: am b367fd6a: Merge "Displaying Bitmaps Efficiently Training - Update sample app zip" into jb-mr1-dev 
* commit 'f64fd772f4c36edfcf46bc2148a7208244ad4f31':
 2013-03-05 13:02:52 -08:00
Dirk Dougherty
1b272cbd55 am f02ebca3: am 47dae077: Doc change: Update DC image, fix typo. 
* commit 'f02ebca3c2660b61afee2a656ce52f410cd05646':
 2013-03-05 13:02:50 -08:00
Dirk Dougherty
af749fece4 am 893f0cc1: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing. 
* commit '893f0cc179ca29d8a55eb36bd2108e428d33c406':
 2013-03-05 13:02:46 -08:00
Scott Main
23513a2c85 docs: update country filtering description 
bug: 8278024

Change-Id: Ia401ed1c2e7ce12052db217265a1a420c44ffe78
 2013-03-05 12:19:10 -08:00
Scott Main
0f8958d053 am e3b8a46c: am f4c80adc: am 48ff42cd: am 864e60fb: Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev 
* commit 'e3b8a46c4c37bf72086697c5add976297e329190':
  cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13
 2013-03-05 11:49:21 -08:00
Scott Main
e3b8a46c4c am f4c80adc: am 48ff42cd: am 864e60fb: Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev 
* commit 'f4c80adc04788c802c4a8df305d0ef8a1fe154b7':
  cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13
 2013-03-05 11:47:32 -08:00
Joe Malin
d88cccc9ba am 72ee1820: am c1767371: am ebdf1ccc: am 33a9f63c: Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev 
* commit '72ee1820ceb5595087baca1c1205f5140197e0cb':
  Bug 8289268: Reversed text Content Provider Basics
 2013-03-05 11:45:51 -08:00
Scott Main
f4c80adc04 am 48ff42cd: am 864e60fb: Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev 
* commit '48ff42cd1ca381b1de535bd74405649215bc7d01':
  cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13
 2013-03-05 11:45:39 -08:00
Joe Malin
72ee1820ce am c1767371: am ebdf1ccc: am 33a9f63c: Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev 
* commit 'c17673712a8b199f0e30fd9fc920e9ff7d928dc9':
  Bug 8289268: Reversed text Content Provider Basics
 2013-03-05 11:44:11 -08:00
Scott Main
48ff42cd1c am 864e60fb: Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev 
* commit '864e60fb26ddb7c48d0f0b9a0519e40b2fd528f0':
  cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13
 2013-03-05 11:43:49 -08:00
Scott Main
c7c3befff6 am 864e60fb: Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev 
* commit '864e60fb26ddb7c48d0f0b9a0519e40b2fd528f0':
  cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13
 2013-03-05 11:43:02 -08:00
Joe Malin
c17673712a am ebdf1ccc: am 33a9f63c: Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev 
* commit 'ebdf1ccc5bd18e2f55d6f900382dabad4a287b9b':
  Bug 8289268: Reversed text Content Provider Basics
 2013-03-05 11:42:15 -08:00
Joe Malin
ebdf1ccc5b am 33a9f63c: Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev 
* commit '33a9f63c1c81e44d09b2b509c04db5218ed64c0f':
  Bug 8289268: Reversed text Content Provider Basics
 2013-03-05 11:40:15 -08:00
Scott Main
864e60fb26 Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev 2013-03-05 19:39:38 +00:00
Joe Malin
91dad7e8a3 am 33a9f63c: Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev 
* commit '33a9f63c1c81e44d09b2b509c04db5218ed64c0f':
  Bug 8289268: Reversed text Content Provider Basics
 2013-03-05 11:38:37 -08:00
Joe Malin
33a9f63c1c Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev 2013-03-05 19:35:57 +00:00
Scott Main
6e140b6b86 cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f 
dashboard update for 4/4/13

Change-Id: I04903c2c7ef56f6bef39a9e01fcce386d26e4763
 2013-03-05 11:35:49 -08:00
Adam Koch
e43d5714fc am 1a5bec01: Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 
* commit '1a5bec0127ca4584008a1ab9e1ce49e671f8387c':
  Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653
 2013-03-05 06:37:48 -08:00
Adam Koch
cc3fec699d am 0c8dfd7d: am 1061c578: am 095aa4b6: am 1a5bec01: Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 
* commit '0c8dfd7d281d037df3d427ccb6bf4642b2617a63':
  Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653
 2013-03-05 06:36:31 -08:00
Adam Koch
0c8dfd7d28 am 1061c578: am 095aa4b6: am 1a5bec01: Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 
* commit '1061c578b1a341ecb7286009daa9173e0b7e0dc0':
  Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653
 2013-03-05 06:33:56 -08:00
Adam Koch
1061c578b1 am 095aa4b6: am 1a5bec01: Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 
* commit '095aa4b611472f64bdbd1499d05b747cebc3f792':
  Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653
 2013-03-05 06:32:13 -08:00
Adam Koch
095aa4b611 am 1a5bec01: Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 
* commit '1a5bec0127ca4584008a1ab9e1ce49e671f8387c':
  Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653
 2013-03-05 06:30:03 -08:00
Adam Koch
1a5bec0127 Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev 2013-03-05 14:25:51 +00:00
Roger Chen
002ecd2122 Audio continue to played even if paused manually 
Currently, audio will resume playing after a phone call
or notification even if the user had manually paused playback.

This patch addresses that by introducing a new player state
to distinguish the user pausing playback and the browser
losing audio focus for some other reason. Audio will only
 resume if the browser temporarily lost audio focus and
not when the user has manually paused playback.

Change-Id: I9e8beaedb0fcc5afe920068297ed9c387eab2ac8
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
 2013-03-05 13:05:34 +00:00
Marco Nelissen
056c610c9b am b6a2978a: Merge "Performance increase in thumbnail handling" 
* commit 'b6a2978a5118d66bcebc380b0c20e566b7cbdfda':
  Performance increase in thumbnail handling
 2013-03-04 16:31:26 -08:00
Scott Main
0793c6e84f dashboard update for 4/4/13 
Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f
 2013-03-04 16:18:27 -08:00
Marco Nelissen
b6a2978a51 Merge "Performance increase in thumbnail handling" 2013-03-05 00:06:33 +00:00
Brian Carlstrom
6f2adcf9ab am b0cbf860: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding" 
* commit 'b0cbf8607fb00a2bc54d15e01570cabf147fb5fb':
  Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
 2013-03-04 10:52:49 -08:00
Brian Carlstrom
b0cbf8607f Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding" 2013-03-04 17:50:14 +00:00
Jeff Sharkey
237940a092 am 2048fbb1: am c807070c: am 1e5e3748: am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes. 
* commit '2048fbb1106a639c6b66298b94ab98eb4c650542':
  Tighten enforcement of file modes.
 2013-03-01 17:31:54 -08:00
Jeff Sharkey
2048fbb110 am c807070c: am 1e5e3748: am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes. 
* commit 'c807070cb54228f1039cd0a3f2fe14efbe46df3e':
  Tighten enforcement of file modes.
 2013-03-01 17:30:45 -08:00
Jeff Sharkey
c807070cb5 am 1e5e3748: am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes. 
* commit '1e5e3748d4d431e48bd4b6a461ab3a9127beff7d':
  Tighten enforcement of file modes.
 2013-03-01 17:28:32 -08:00
Jeff Sharkey
f9ed7dc96a am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes. 
* commit '67f2957331a63474879f68bf1a8d17b60b2188cd':
  Tighten enforcement of file modes.
 2013-03-01 17:26:07 -08:00