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

117482 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ed Heyl
af49ff8c39 am a951fa56: merge in release branch changes (no-op). 
* commit 'a951fa56f1855cd0337bddacc01e35868c6d66d6':
  camera2: Remove prior repeating request when setting.
 2013-11-13 15:23:23 -08:00
Elliott Hughes
84f4ad8071 am 87c5eeb4: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." 
* commit '87c5eeb48b1a0c498eae9bd2877fb33678d90b8a':
  Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
 2013-11-13 15:21:51 -08:00
Ed Heyl
a951fa56f1 merge in release branch changes (no-op). 2013-11-13 15:19:22 -08:00
Craig Mautner
f4703da89b am ef1dd26e: am 0e823a45: Merge "Keyguard isn\'t visible if it hasn\'t been drawn." into klp-dev 
* commit 'ef1dd26ee7b4d8a6ec854bd0b5b9557d67b554f5':
  Keyguard isn't visible if it hasn't been drawn.
 2013-11-13 15:18:47 -08:00
Elliott Hughes
87c5eeb48b Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." 2013-11-13 23:18:00 +00:00
Craig Mautner
ef1dd26ee7 am 0e823a45: Merge "Keyguard isn\'t visible if it hasn\'t been drawn." into klp-dev 
* commit '0e823a450a729a753fb8e0618474b6ae3cf3b810':
  Keyguard isn't visible if it hasn't been drawn.
 2013-11-13 15:14:45 -08:00
Craig Mautner
0e823a450a Merge "Keyguard isn't visible if it hasn't been drawn." into klp-dev 2013-11-13 23:11:12 +00:00
Elliott Hughes
99f752149b Fix a JNI local reference leak in JNIMediaPlayerListener::notify. 
Bug: https://code.google.com/p/android/issues/detail?id=62137
Change-Id: I776cd83a66de37fdbbe8af367bf1b26e5e0c7247
 2013-11-13 15:10:40 -08:00
Craig Mautner
ada62fca51 Add null pointer check. 
Fixes bug 11673948.

Change-Id: I60b590b9793ae1b8d5c3d343f4bb6cb40ba4a092
 2013-11-13 15:09:55 -08:00
Joe Fernandez
6cb431fcb1 docs: Support Library setup docs fix 
Fix issues with instructions, including:
b/10808558

Change-Id: I188a021223946b21d12e050819e7257d86e2965f
 2013-11-13 14:59:24 -08:00
Baligh Uddin
d5cb5d0fea am 22bc9f43: (-s ours) am dc0acc6f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '22bc9f4381e4b058124095abf50209c475c02908':
  Import translations. DO NOT MERGE
 2013-11-13 14:46:17 -08:00
Baligh Uddin
22bc9f4381 am dc0acc6f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'dc0acc6f5d4cc8e4ed6d2a13793030350cd6262d':
  Import translations. DO NOT MERGE
 2013-11-13 14:42:44 -08:00
Baligh Uddin
dc0acc6f5d Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-13 22:39:40 +00:00
Jeff Sharkey
d596104a32 am 529ba106: am 711d390b: Merge "Small DocumentsProvider doc improvements." into klp-dev 
* commit '529ba10693bbb2d756b2ba6af706accdba64692a':
  Small DocumentsProvider doc improvements.
 2013-11-13 14:39:25 -08:00
Jeff Sharkey
529ba10693 am 711d390b: Merge "Small DocumentsProvider doc improvements." into klp-dev 
* commit '711d390be96531c5dfadb9a17e373f1e92ef16a1':
  Small DocumentsProvider doc improvements.
 2013-11-13 14:34:49 -08:00
Jim Miller
3b44dd88a5 am 291b7f56: am 3714473f: Merge "Enable fast camera transition when launched from navbar" into klp-dev 
* commit '291b7f56159a942911c5e83c42b89ecd2440708c':
  Enable fast camera transition when launched from navbar
 2013-11-13 14:32:35 -08:00
Jeff Sharkey
711d390be9 Merge "Small DocumentsProvider doc improvements." into klp-dev 2013-11-13 22:31:01 +00:00
Jim Miller
291b7f5615 am 3714473f: Merge "Enable fast camera transition when launched from navbar" into klp-dev 
* commit '3714473f1a077cae6eca3079da67a7dd09dcff65':
  Enable fast camera transition when launched from navbar
 2013-11-13 14:28:06 -08:00
Jim Miller
13c7984d2d am cefe47c0: am 9c8d56a6: Merge "Reduce camera launch time by about 250ms." into klp-dev 
* commit 'cefe47c0d3471aedd4f7d4d3b5137a2a95161ad4':
  Reduce camera launch time by about 250ms.
 2013-11-13 14:27:58 -08:00
Svetoslav Ganov
9358d98d83 am 852a8895: am d697ba73: Merge "Fix NPE at PrintSpooler in Japanese environment." into klp-dev 
* commit '852a8895e18ad578a4c299d13615a4cbb3ee1211':
  Fix NPE at PrintSpooler in Japanese environment.
 2013-11-13 14:27:54 -08:00
Jim Miller
cefe47c0d3 am 9c8d56a6: Merge "Reduce camera launch time by about 250ms." into klp-dev 
* commit '9c8d56a692198a3fc1629a0407ea6027f04e9a91':
  Reduce camera launch time by about 250ms.
 2013-11-13 14:24:26 -08:00
Svetoslav Ganov
852a8895e1 am d697ba73: Merge "Fix NPE at PrintSpooler in Japanese environment." into klp-dev 
* commit 'd697ba73b5a5fc5dc502a117a8f06e8f1a5359b9':
  Fix NPE at PrintSpooler in Japanese environment.
 2013-11-13 14:24:23 -08:00
Jim Miller
3714473f1a Merge "Enable fast camera transition when launched from navbar" into klp-dev 2013-11-13 22:23:34 +00:00
Jim Miller
9c8d56a692 Merge "Reduce camera launch time by about 250ms." into klp-dev 2013-11-13 22:22:13 +00:00
Svetoslav Ganov
d697ba73b5 Merge "Fix NPE at PrintSpooler in Japanese environment." into klp-dev 2013-11-13 22:19:57 +00:00
Baligh Uddin
b4aac8d832 Import translations. DO NOT MERGE 
Change-Id: I11d764583416d7fb4dfc85ebe81a98b6a1267424
Auto-generated-cl: translation import
 2013-11-13 13:39:45 -08:00
Svetoslav
e84f23b5fd am 60020252: am 14f30080: Merge "Update the PrintDocumentAdapter docs." into klp-dev 
* commit '60020252db88825b0c0951de7fef6f07d68786a9':
  Update the PrintDocumentAdapter docs.
 2013-11-13 13:38:21 -08:00
Svetoslav
60020252db am 14f30080: Merge "Update the PrintDocumentAdapter docs." into klp-dev 
* commit '14f300803b7d16a3c9632cb626529e873e4813f1':
  Update the PrintDocumentAdapter docs.
 2013-11-13 13:34:00 -08:00
Jeff Sharkey
3b945405cf Small DocumentsProvider doc improvements. 
Bug: 11670294
Change-Id: I5fb91c7665fc2a4531059ef9f2de0972ebabe1ea
 2013-11-13 13:31:17 -08:00
Svetoslav
14f300803b Merge "Update the PrintDocumentAdapter docs." into klp-dev 2013-11-13 21:30:58 +00:00
Dirk Dougherty
7c85b522e3 am 026d0684: am 90b7f631: Doc change: fix typo. 
* commit '026d06847b535da75626211bae400729deb80f9b':
  Doc change: fix typo.
 2013-11-13 13:18:55 -08:00
Dirk Dougherty
026d06847b am 90b7f631: Doc change: fix typo. 
* commit '90b7f6311849fb68d2bc5fa0affb86c7e5d3a3b0':
  Doc change: fix typo.
 2013-11-13 21:15:42 +00:00
Baligh Uddin
2218d330ad am 814b0b73: (-s ours) am 2a22627e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '814b0b734772bfdbaa6b1888a253afc00c78bb58':
  Import translations. DO NOT MERGE
 2013-11-13 13:11:53 -08:00
Baligh Uddin
d0e2b18f55 am 4a0e3b9a: (-s ours) am 5cc3ddf1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '4a0e3b9ac5cb9006a3efe951fcd7f7427d4726cc':
  Import translations. DO NOT MERGE
 2013-11-13 13:11:50 -08:00
Craig Mautner
5c7bd01705 Keyguard isn't visible if it hasn't been drawn. 
Reduces jank in multiuser lock from QuickSettings. The launcher and
wallpaper were being hidden as soon as the surface for the keyguard
was created. Now they are not hidden until the keyguard has been
drawn. This still leaves a short time where there is a black screen
but it is considerably shorter than it was. Comparable to jb now.

Fixes bug 11046339.

Change-Id: I349d95dba72da27e5c05a7a64c95a2774d17a34e
 2013-11-13 13:09:35 -08:00
Dirk Dougherty
90b7f63118 Doc change: fix typo. 
Change-Id: I74932b2dff099af1ba2bc048575586fd9e3593a5
 2013-11-13 13:08:46 -08:00
Baligh Uddin
814b0b7347 am 2a22627e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '2a22627e179cdb767c709dc68d78b4903d9239f9':
  Import translations. DO NOT MERGE
 2013-11-13 13:07:52 -08:00
Baligh Uddin
4a0e3b9ac5 am 5cc3ddf1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '5cc3ddf16fee6d6aa8439e6ebcb3f3feeec98608':
  Import translations. DO NOT MERGE
 2013-11-13 13:07:49 -08:00
Baligh Uddin
2a22627e17 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-13 21:04:25 +00:00
Baligh Uddin
5cc3ddf16f Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-13 21:04:07 +00:00
Baligh Uddin
bc3be0e3dc Import translations. DO NOT MERGE 
Change-Id: I3b40e99b029a65ade59ec8f7ad06c0a143895269
Auto-generated-cl: translation import
 2013-11-13 12:24:32 -08:00
Christopher Tate
87b84ca6fc am e995ad15: am 0b2c2b10: Merge "Support preferred activities with zero or one scheme in the filter" into klp-dev 
* commit 'e995ad1559ac12a0ac5e2e56ce378b0b29f10f24':
  Support preferred activities with zero or one scheme in the filter
 2013-11-13 12:14:29 -08:00
Daniel Sandler
086034117d am 2f4fb5ee: am 31f7c912: Merge "Bespoke, handcrafted, artisanal assist affordance assets." into klp-dev 
* commit '2f4fb5eef5ac5c08f7d30c75b56990ce5a729509':
  Bespoke, handcrafted, artisanal assist affordance assets.
 2013-11-13 12:14:25 -08:00
Daniel Sandler
076dcaf11b am 80ffcb19: am 42498417: Merge "DessertCase fixes:" into klp-dev 
* commit '80ffcb194b31839308bbe57c057611fd41cef5e1':
  DessertCase fixes:
 2013-11-13 12:14:22 -08:00
Daniel Sandler
94913629be am 6150abd8: am f554042a: Merge "Switch DeadZone to Slog." into klp-dev 
* commit '6150abd8f9557a923e1e9753d5c35d241cd79411':
  Switch DeadZone to Slog.
 2013-11-13 12:14:19 -08:00
John Huang
c4f535bdda am 299e011e: am 54ca9066: Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev 
* commit '299e011ebd7ce9593c203ecfc9f5eed45360a5ed':
  Get rid of a race in NsdService in stopResolveService and getAddrInfo
 2013-11-13 12:14:16 -08:00
Christopher Tate
e995ad1559 am 0b2c2b10: Merge "Support preferred activities with zero or one scheme in the filter" into klp-dev 
* commit '0b2c2b10053afd7a525dbf8a4eb0f0aaf98739b3':
  Support preferred activities with zero or one scheme in the filter
 2013-11-13 12:07:22 -08:00
Daniel Sandler
2f4fb5eef5 am 31f7c912: Merge "Bespoke, handcrafted, artisanal assist affordance assets." into klp-dev 
* commit '31f7c912f0b6a2cfa2ea0f0b3a9022e8323f5542':
  Bespoke, handcrafted, artisanal assist affordance assets.
 2013-11-13 12:07:20 -08:00
Daniel Sandler
80ffcb194b am 42498417: Merge "DessertCase fixes:" into klp-dev 
* commit '424984172bb2a89dd06cc49fd5a3665bc7c85e5c':
  DessertCase fixes:
 2013-11-13 12:07:16 -08:00
Daniel Sandler
6150abd8f9 am f554042a: Merge "Switch DeadZone to Slog." into klp-dev 
* commit 'f554042a9582c5b4ad1b0d41bc08a0caad470798':
  Switch DeadZone to Slog.
 2013-11-13 12:07:13 -08:00