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

100493 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
6978d04b44 am 9d95873d: Merge "docs: SDK r21.1 - fix download links, Issue 8193979" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Joe Fernandez (1)
* commit '9d95873de1bdb024bcf50a51c5a6606a645f9d5d':
  docs: SDK r21.1 - fix download links, Issue 8193979
 2013-02-13 15:27:09 -08:00
Craig Mautner
8fc72b2a70 am ee6e27c1: Merge "Stop using AppToken movement and start using Task." 
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit 'ee6e27c122491356f5203b105206a55f0e984fe7':
  Stop using AppToken movement and start using Task.
 2013-02-13 15:25:23 -08:00
Craig Mautner
b0c0b1fd70 Remove unused App methods. 
Now that the Task methods have replaced the App methods remove
the App methods.

Change-Id: I0e7432f2c6f99708759ed8c871d20eb5bd38c3c2
 2013-02-13 15:24:14 -08:00
Joe Fernandez
9d95873de1 Merge "docs: SDK r21.1 - fix download links, Issue 8193979" into jb-mr1-dev 2013-02-13 23:24:10 +00:00
Kenny Root
0150e48200 KeyChain: return null instead of throw 
The API documentation says it will return null if the key isn't found.
We get null back from the keystore daemon when it can't retrieve the
data, so just return null back to the API caller.

Change-Id: I42248bd50cbc5f76864bd762aae3faab1c50529d
 2013-02-13 15:24:06 -08:00
Craig Mautner
ee6e27c122 Merge "Stop using AppToken movement and start using Task." 2013-02-13 23:22:27 +00:00
Kenny Root
e151f281d5 Track keystore binder changes 
Change-Id: Id6133be059a8a0901d16355a9152e40e4a255454
 2013-02-13 15:22:25 -08:00
Scott Main
ad8aa7a12e am 27b2b04f: am f796c279: am e526eedb: am 1f6dbc0d: am c6608215: am d51a894a: docs: fix tools sidenav for offline docs 
# Via Android Git Automerger (5) and Scott Main (1)
* commit '27b2b04f3c75315cd95357919d34d937ffeac742':
  docs: fix tools sidenav for offline docs
 2013-02-13 15:21:56 -08:00
Stephen Hines
d807222cb3 am 1f884ed2: Merge "Add tests for the new clipped kernel Java reflection." 
# Via Android (Google) Code Review (1) and Stephen Hines (1)
* commit '1f884ed206a2be6542ada58b2a7e033e782ed867':
  Add tests for the new clipped kernel Java reflection.
 2013-02-13 15:21:54 -08:00
Scott Main
27b2b04f3c am f796c279: am e526eedb: am 1f6dbc0d: am c6608215: am d51a894a: docs: fix tools sidenav for offline docs 
# Via Android Git Automerger (4) and Scott Main (1)
* commit 'f796c2793388184e2642afd8e244762d48d54761':
  docs: fix tools sidenav for offline docs
 2013-02-13 15:19:17 -08:00
Chris Craik
936b3cd812 am c932760f: (-s ours) Merge "Revert "Merge remote-tracking branch \'goog/master-chromium\' into \'goog/master\'" DO NOT MERGE" 
# Via Android (Google) Code Review (1) and Chris Craik (1)
* commit 'c932760f667cf56ca7a1aeffde505745dc3632e1':
  Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE
 2013-02-13 15:18:11 -08:00
Svetoslav
ef367729d1 am eb26fbe4: Merge "Fixing a NPE in accessibility manager service." 
# Via Android (Google) Code Review (1) and Svetoslav (1)
* commit 'eb26fbe427192bc87bb3dbb7882dbf87f760fab2':
  Fixing a NPE in accessibility manager service.
 2013-02-13 15:18:05 -08:00
Irfan Sheriff
bbb6b93750 am 6e1a0738: Merge "Expose EAP config API" 
# Via Android (Google) Code Review (1) and Irfan Sheriff (1)
* commit '6e1a0738e9bcefc442ad45e1d6f6af0e5ace7b17':
  Expose EAP config API
 2013-02-13 15:18:02 -08:00
Stephen Hines
1f884ed206 Merge "Add tests for the new clipped kernel Java reflection." 2013-02-13 23:17:54 +00:00
Scott Main
f796c27933 am e526eedb: am 1f6dbc0d: am c6608215: am d51a894a: docs: fix tools sidenav for offline docs 
# Via Android Git Automerger (3) and Scott Main (1)
* commit 'e526eedb8e0145f96991219abd9022ef52f4b976':
  docs: fix tools sidenav for offline docs
 2013-02-13 15:17:02 -08:00
Chris Craik
c932760f66 Merge "Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE" 2013-02-13 23:14:58 +00:00
Scott Main
e526eedb8e am 1f6dbc0d: am c6608215: am d51a894a: docs: fix tools sidenav for offline docs 
# Via Android Git Automerger (2) and Scott Main (1)
* commit '1f6dbc0dccd6eba712848ac36bace4fc16f84fd1':
  docs: fix tools sidenav for offline docs
 2013-02-13 15:14:41 -08:00
Martijn Coenen
f3d31cf1b0 am 21654f9e: Merge "Add exception types for NfcEe operations." 
# Via Android (Google) Code Review (1) and Martijn Coenen (1)
* commit '21654f9efc66aed05d35f618aa953d05e78eecad':
  Add exception types for NfcEe operations.
 2013-02-13 15:14:35 -08:00
Svetoslav
eb26fbe427 Merge "Fixing a NPE in accessibility manager service." 2013-02-13 23:14:10 +00:00
Scott Main
1f6dbc0dcc am c6608215: am d51a894a: docs: fix tools sidenav for offline docs 
# Via Android Git Automerger (1) and Scott Main (1)
* commit 'c660821502e5e27d10ea2d9248fb3c700f5560e5':
  docs: fix tools sidenav for offline docs
 2013-02-13 15:13:24 -08:00
Irfan Sheriff
6e1a0738e9 Merge "Expose EAP config API" 2013-02-13 23:12:45 +00:00
Scott Main
c660821502 am d51a894a: docs: fix tools sidenav for offline docs 
# Via Scott Main
* commit 'd51a894a50b6dd48023fdc5b79c6f889a3988903':
  docs: fix tools sidenav for offline docs
 2013-02-13 15:11:19 -08:00
Stephen Hines
43b874fd63 am 9b10e27d: Merge "Add rsnScriptForEachClipped() implementation with no param array." 
# Via Android (Google) Code Review (1) and Stephen Hines (1)
* commit '9b10e27d60765b36271848e87230e8c6ca4b1ed2':
  Add rsnScriptForEachClipped() implementation with no param array.
 2013-02-13 15:11:12 -08:00
Martijn Coenen
21654f9efc Merge "Add exception types for NfcEe operations." 2013-02-13 23:10:56 +00:00
Scott Main
d51a894a50 docs: fix tools sidenav for offline docs 
Change-Id: If15ec25f395d9e18f35085488b75be8f84a6d42f
 2013-02-13 15:06:41 -08:00
Stephen Hines
9b10e27d60 Merge "Add rsnScriptForEachClipped() implementation with no param array." 2013-02-13 23:06:34 +00:00
Svetoslav
0726843ea0 Fixing a NPE in accessibility manager service. 
There was a missing null checks as a result of a recent
refactoring.

bug:8185435

Change-Id: I3a1e256b434755b3a27f609dd2b6aeec31aa9a4f
 2013-02-13 14:59:00 -08:00
Joe Fernandez
b80012e35c docs: SDK r21.1 - fix download links, Issue 8193979 
Change-Id: Iabbbb030d50390021feab478812140158cdfd104
 2013-02-13 14:51:59 -08:00
Philip Milne
13d5753fd9 am fd0fa65e: Merge "Revert "Fix for bug: 8184401 - GridLayout accounts for child\'s size/measurements even when a child is "GONE""" 
# Via Android (Google) Code Review
* commit 'fd0fa65eeae00f58863af060950e10f20971726b':
  Revert "Fix for bug: 8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE""
 2013-02-13 14:27:56 -08:00
Philip Milne
fd0fa65eea Merge "Revert "Fix for bug: 8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE""" 2013-02-13 22:23:45 +00:00
Philip Milne
57ce47134a Revert "Fix for bug: 8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE"" 
Suspected cause of: http://b.corp.google.com/issue?id=8192858 

This reverts commit e5e0b7f191b64380e9231a2b755ecd3738598dec

Change-Id: I1a35c12c3ca0b1eacfb0c1a4d6ba03601dab664b
 2013-02-13 22:07:50 +00:00
Jason Sams
fb2f5c207a Reuse context and allocations across test. 
Change-Id: I9a3498c9095db2c7876bf45d6bd5c75deded8dd8
 2013-02-13 12:11:53 -08:00
Craig Mautner
926f3839d8 Stop using AppToken movement and start using Task. 
Change-Id: I5fbd3b2b692e0e127386051f782b1015515ba384
 2013-02-13 11:58:56 -08:00
Chris Craik
a11c381418 am 68b60091: Merge "Revert "Use RenderScript for large text blurs"" 
# Via Android (Google) Code Review
* commit '68b600913b699da0fbfcd9d913e4c4fdb08e06b8':
  Revert "Use RenderScript for large text blurs"
 2013-02-13 11:53:45 -08:00
Chris Craik
68b600913b Merge "Revert "Use RenderScript for large text blurs"" 2013-02-13 19:50:24 +00:00
Craig Mautner
6ad4530a58 am 769a5b72: Merge "Replace access to mAppTokens with AppTokenIterator" 
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit '769a5b72dc076facae20154bf5d55b9810322b87':
  Replace access to mAppTokens with AppTokenIterator
 2013-02-13 11:48:00 -08:00
Chris Craik
bf5703e52e Revert "Use RenderScript for large text blurs" 
This reverts commit 3f76e65d251ead65fe8ff98e3bd4c7623fbaac07

Change-Id: Ia81cd485e5ca696bb284c419dc8a1d2f3247100e
 2013-02-13 19:47:24 +00:00
Jean-Michel Trivi
21b1549cac am 0888a067: Merge "Fix AudioFocus for back-to-back notifications" 
# Via Android (Google) Code Review (1) and Jean-Michel Trivi (1)
* commit '0888a06762fb55d48646c86c6a0184a0b96cdc24':
  Fix AudioFocus for back-to-back notifications
 2013-02-13 11:44:38 -08:00
Craig Mautner
769a5b72dc Merge "Replace access to mAppTokens with AppTokenIterator" 2013-02-13 19:44:35 +00:00
Jean-Michel Trivi
fc95e673d3 am 23bbe02b: Merge "No AudioFocus for notifications when media played remotely" 
# Via Android (Google) Code Review (1) and Jean-Michel Trivi (1)
* commit '23bbe02b363bb96bd56d4008141e8cf800bb46b7':
  No AudioFocus for notifications when media played remotely
 2013-02-13 11:41:12 -08:00
Jean-Michel Trivi
0888a06762 Merge "Fix AudioFocus for back-to-back notifications" 2013-02-13 19:40:33 +00:00
Romain Guy
c29aff2581 am 0450086a: Merge "Fix format name typo" 
# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit '0450086a845709091e176f142d60dbe553c1bce3':
  Fix format name typo
 2013-02-13 11:37:49 -08:00
Jean-Michel Trivi
23bbe02b36 Merge "No AudioFocus for notifications when media played remotely" 2013-02-13 19:37:45 +00:00
Chris Craik
5c8fe3d447 am bce29d2a: Merge "Use RenderScript for large text blurs" 
# Via Android (Google) Code Review (1) and Chris Craik (1)
* commit 'bce29d2a549c374e642ad7a41a1daf869b46f53c':
  Use RenderScript for large text blurs
 2013-02-13 11:37:45 -08:00
Romain Guy
0450086a84 Merge "Fix format name typo" 2013-02-13 19:35:33 +00:00
Jeff Sharkey
3cee8f660a am eff99182: Merge "Escape arguments before passing to netd." 
# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit 'eff99182297f1c762789237a7d66c9bef754a3d7':
  Escape arguments before passing to netd.
 2013-02-13 11:34:23 -08:00
Romain Guy
2b44eb75c4 Fix format name typo 
Change-Id: If7d86b74ad9735f12349d9fcb62b335f5a742bb5
 2013-02-13 11:33:26 -08:00
Chris Craik
bce29d2a54 Merge "Use RenderScript for large text blurs" 2013-02-13 19:32:56 +00:00
Romain Guy
bd11e07a5c am 93799ba0: Merge "Add a render buffer cache to reuse stencil buffers Bug #7146141" 
# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit '93799ba01b5f2902d7120db8416a1e15103286e8':
  Add a render buffer cache to reuse stencil buffers Bug #7146141
 2013-02-13 11:30:57 -08:00
Jeff Sharkey
eff9918229 Merge "Escape arguments before passing to netd." 2013-02-13 19:29:58 +00:00