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

100972 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Irfan Sheriff
408f4edb5e Merge "Fix concurrency issues" into jb-mr2-dev 2013-02-27 19:17:28 +00:00
Irfan Sheriff
ab3b9fbfa0 Fix concurrency issues 
Make true copy of list when passing off on broadcast

Bug: 8212369
Change-Id: Iaf4a303513d267f76bd16b845ec68baabfca6b45
 2013-02-27 11:06:45 -08:00
Scott Main
35cd94ab97 am 4539955e: am 8f03a47e: am 464deaba: am 3383c015: am 9d167eaa: docs: another string change for developer console bug: 8033647 
* commit '4539955e1d76fe1d2e7cea5eb20fdf51232234c2':
  docs: another string change for developer console bug: 8033647
 2013-02-27 18:23:57 +00:00
Scott Main
4539955e1d am 8f03a47e: am 464deaba: am 3383c015: am 9d167eaa: docs: another string change for developer console bug: 8033647 
* commit '8f03a47e5664243cb7ad50f63c8d411c55355550':
  docs: another string change for developer console bug: 8033647
 2013-02-27 10:21:32 -08:00
Scott Main
8f03a47e56 am 464deaba: am 3383c015: am 9d167eaa: docs: another string change for developer console bug: 8033647 
* commit '464deaba78650f0ba8aacb7c21361ed9ea4cbd8c':
  docs: another string change for developer console bug: 8033647
 2013-02-27 10:20:06 -08:00
Scott Main
464deaba78 am 3383c015: am 9d167eaa: docs: another string change for developer console bug: 8033647 
* commit '3383c01569ce62edb7ea886338ef563ab7345955':
  docs: another string change for developer console bug: 8033647
 2013-02-27 10:18:54 -08:00
Scott Main
3383c01569 am 9d167eaa: docs: another string change for developer console bug: 8033647 
* commit '9d167eaa7d43f7fb4a0dd77f0cbd8f09b566df4c':
  docs: another string change for developer console bug: 8033647
 2013-02-27 10:16:36 -08:00
Scott Main
9d167eaa7d docs: another string change for developer console 
bug: 8033647

Change-Id: Ia6b476e22f2e370eeefd0556e2c9d0b4295482a9
 2013-02-27 10:08:27 -08:00
Ian Rogers
0493d7997e am 75dcb333: am 545464df: Merge "Deprecate and document memory allocation counting." 
* commit '75dcb3338d85d12991249598e1ed407c8a6be1eb':
  Deprecate and document memory allocation counting.
 2013-02-27 16:53:20 +00:00
Ian Rogers
75dcb3338d am 545464df: Merge "Deprecate and document memory allocation counting." 
* commit '545464df282273209a837569f05e9990173f4d56':
  Deprecate and document memory allocation counting.
 2013-02-27 08:50:56 -08:00
Ian Rogers
545464df28 Merge "Deprecate and document memory allocation counting." 2013-02-27 16:45:39 +00:00
Ben Murdoch
0e2f22a42b Merge "Update WebView#PictureListener for JBMR2." into jb-mr2-dev 2013-02-27 11:40:05 +00:00
Ben Murdoch
52643e0ceb Update WebView#PictureListener for JBMR2. 
Now JBMR2 constant is defined, update code and docs to use it.

Bug: 8241082
Change-Id: If221c6524b79cc259ffc71fc218b141ffe6ed790
 2013-02-27 11:38:25 +00:00
Romain Guy
d9731a57c6 am bf53be46: am 09353f74: Merge "Check and fail early if requested wallpaper size exceeds maximum texture size." 
* commit 'bf53be46d237866a9964a4f1fa960eb6ef4a70a6':
  Check and fail early if requested wallpaper size exceeds maximum texture size.
 2013-02-27 07:08:15 +00:00
Romain Guy
bf53be46d2 am 09353f74: Merge "Check and fail early if requested wallpaper size exceeds maximum texture size." 
* commit '09353f747835c23d02df9e18ecdd6a7d1c91310c':
  Check and fail early if requested wallpaper size exceeds maximum texture size.
 2013-02-26 23:05:44 -08:00
Romain Guy
09353f7478 Merge "Check and fail early if requested wallpaper size exceeds maximum texture size." 2013-02-27 06:07:31 +00:00
Svetoslav
a60fdfac94 NPE in AccessibilityManagerService. 
If an accessibility service is connected but already removed
from the list of connecting services we get a NPE since the
call to set the service connection is made over a null
remove interface. Note that service connection is asynchronous.

bug:8229877

Change-Id: I7b05f219dd0c1da6286ee4ec90b1ef310908545d
 2013-02-26 19:25:01 -08:00
Dianne Hackborn
9ad6654177 Merge "New ContentProvider initialization for testing." into jb-mr2-dev 2013-02-27 01:18:12 +00:00
Dmitry Shmidt
be1a8cda3e wifi: Fix scan results merge 
Change-Id: I1fd6ce9cfe2966902696f5eaf58bf97086772ed4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2013-02-26 17:01:36 -08:00
Dmitry Shmidt
67b3fbf49c wifi: Get full scan results 
BUG: 8236341

Change-Id: Ic0b769eed6bfcdc12644bf461060d3e42ab18e86
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2013-02-26 16:22:15 -08:00
Dianne Hackborn
334d9aebc2 New ContentProvider initialization for testing. 
Using this turns off app ops checks.

Change-Id: If29d4ca2fe9ddf1a1663d3a824b2f0afe7375862
 2013-02-26 16:16:14 -08:00
Romain Guy
aed205068d Merge "Update Hardware Acceleration API guide" into jb-mr2-dev 2013-02-26 23:21:45 +00:00
Alon Albert
174ea7d1a7 Merge "Document extra account_types" into jb-mr2-dev 2013-02-26 23:17:00 +00:00
Alon Albert
50359c26e7 Document extra account_types 
The action android.settings.ADD_ACCOUNT_SETTINGS supports an extra
"account_types" (See AddAccountSettings & ChooseAccountActivity) but
that's not documented anywhere.
Oddly, the other 2 places that support the "authorities" extra do not
also support "account_types".

Change-Id: I99b7be0b0d6fff1cbccdf8b8b8e4fd2be9548e6c
 2013-02-26 14:54:07 -08:00
Romain Guy
9ff7d16c7e Update Hardware Acceleration API guide 
Adds a table that clearly identifies what drawing operations are
supported across different API levels.

Change-Id: Ib925d550579d88e0632a51dcf9d3ce625fccbb71
 2013-02-26 14:49:35 -08:00
Scott Main
3383d393a7 am 611bc6d4: am 98411a1c: am 2c675f07: am 22a73ce3: am 2d0b481f: docs: followup to I32f25b692872ed7827e611890c563498993b2480 
* commit '611bc6d44622de444eba350777f1a1ce5dd7359b':
  docs: followup to I32f25b692872ed7827e611890c563498993b2480
 2013-02-26 22:43:25 +00:00
Jean-Baptiste Queru
624eac3d77 am 8298c5b8: am 94c31c85: am d4ed4363: (-s ours) am 909960ad: (-s ours) am ed9cc555: Reconcile with jb-mr1-release - do not merge 
* commit '8298c5b8ffbf0d8d172a9394e3a9a9cf8ec7e554':
 2013-02-26 22:43:22 +00:00
Scott Main
611bc6d446 am 98411a1c: am 2c675f07: am 22a73ce3: am 2d0b481f: docs: followup to I32f25b692872ed7827e611890c563498993b2480 
* commit '98411a1cb8c70c39f7cb8f0ee0caaf1f5a7b0ab9':
  docs: followup to I32f25b692872ed7827e611890c563498993b2480
 2013-02-26 14:41:07 -08:00
Jean-Baptiste Queru
8298c5b8ff am 94c31c85: am d4ed4363: (-s ours) am 909960ad: (-s ours) am ed9cc555: Reconcile with jb-mr1-release - do not merge 
* commit '94c31c85f67ff10a1ea496ce9ea12809174f72c0':
 2013-02-26 14:37:44 -08:00
Scott Main
98411a1cb8 am 2c675f07: am 22a73ce3: am 2d0b481f: docs: followup to I32f25b692872ed7827e611890c563498993b2480 
* commit '2c675f0740695721f04fddffa1abcb6b2b04ffe5':
  docs: followup to I32f25b692872ed7827e611890c563498993b2480
 2013-02-26 14:36:49 -08:00
Scott Main
2c675f0740 am 22a73ce3: am 2d0b481f: docs: followup to I32f25b692872ed7827e611890c563498993b2480 
* commit '22a73ce31b7d58919ef61b281f0290d34fc3f645':
  docs: followup to I32f25b692872ed7827e611890c563498993b2480
 2013-02-26 14:34:45 -08:00
Jean-Baptiste Queru
94c31c85f6 am d4ed4363: (-s ours) am 909960ad: (-s ours) am ed9cc555: Reconcile with jb-mr1-release - do not merge 
* commit 'd4ed4363101201ed24795f50064fe76cb754f979':
 2013-02-26 14:33:30 -08:00
Jean-Baptiste Queru
d4ed436310 am 909960ad: (-s ours) am ed9cc555: Reconcile with jb-mr1-release - do not merge 
* commit '909960ad924687dfa3946cd6a077701968649af0':
 2013-02-26 14:31:23 -08:00
Scott Main
22a73ce31b am 2d0b481f: docs: followup to I32f25b692872ed7827e611890c563498993b2480 
* commit '2d0b481f1078548a6342a852948e504b3e79767a':
  docs: followup to I32f25b692872ed7827e611890c563498993b2480
 2013-02-26 14:30:55 -08:00
Jean Chalard
17100f3976 Merge "Fix dead key -> space combination." into jb-mr2-dev 2013-02-26 22:29:00 +00:00
Scott Main
2d0b481f10 docs: followup to I32f25b692872ed7827e611890c563498993b2480 
Change-Id: I7942e243e77cbe9ea9a7cd542b4255f9ca273a4d
 2013-02-26 14:27:20 -08:00
Jean-Baptiste Queru
909960ad92 am ed9cc555: Reconcile with jb-mr1-release - do not merge 
* commit 'ed9cc555ee69feb0a1b13caf29ffefa56cf51149':
 2013-02-26 14:27:06 -08:00
Michael Wright
173bb61544 Merge "Move stack dump off of InputDispatcher thread" into jb-mr2-dev 2013-02-26 22:14:41 +00:00
Jean-Baptiste Queru
ed9cc555ee Reconcile with jb-mr1-release - do not merge 2013-02-26 14:03:20 -08:00
Dianne Hackborn
d0d209ed4d Merge "App ops: turn off content provider ops when running under test." into jb-mr2-dev 2013-02-26 21:39:43 +00:00
Dianne Hackborn
7e6f976c87 App ops: turn off content provider ops when running under test. 
Change-Id: I3a5084d195de29122b2f5f2a13b5d4f92f22fa92
 2013-02-26 13:35:11 -08:00
Ian Rogers
fe067a4cc5 Deprecate and document memory allocation counting. 
Bug: 8241521
Change-Id: I174c4024600c5b78e74030ecc99e784a98295f09
 2013-02-26 13:30:08 -08:00
John Spurlock
47a5f40465 Merge "DO NOT MERGE - Small documentation fix for AudioManager.java" into jb-mr2-dev 2013-02-26 19:37:06 +00:00
John Spurlock
aac753dcf8 DO NOT MERGE - Small documentation fix for AudioManager.java 
Correct typo + copy-paste description issue.

Cherry-pick of CL Idce7cfeb7255d96aef91efc40d19f077dde3e9a5 from
master.

Change-Id: I1b6f378d58eafdd4a265672a12189273b41f72d6
 2013-02-26 14:18:08 -05:00
Dirk Dougherty
a6c81bb3b3 am 0db6a9e9: am a18ff6f1: am f809e96f: am 1a15b24b: am 012ef92e: Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 
* commit '0db6a9e9a67e7e370cb55d3b4a1d855be9b80f98':
  Doc change: Remove refs to Copy Protection and note EOL in GP.
 2013-02-26 18:50:21 +00:00
Dirk Dougherty
0db6a9e9a6 am a18ff6f1: am f809e96f: am 1a15b24b: am 012ef92e: Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 
* commit 'a18ff6f1ae45c4553e7d2e0c65a5b347bbb370e4':
  Doc change: Remove refs to Copy Protection and note EOL in GP.
 2013-02-26 10:47:54 -08:00
Dirk Dougherty
a18ff6f1ae am f809e96f: am 1a15b24b: am 012ef92e: Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 
* commit 'f809e96fef4df25899c267e1cac648e08ba31a72':
  Doc change: Remove refs to Copy Protection and note EOL in GP.
 2013-02-26 10:44:56 -08:00
Dirk Dougherty
f809e96fef am 1a15b24b: am 012ef92e: Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 
* commit '1a15b24bdd6a42b1c0c36e06c58d408af6eb276b':
  Doc change: Remove refs to Copy Protection and note EOL in GP.
 2013-02-26 10:42:45 -08:00
Dirk Dougherty
1a15b24bdd am 012ef92e: Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 
* commit '012ef92e0358360a6d5109fddc9e58e16b13c80d':
  Doc change: Remove refs to Copy Protection and note EOL in GP.
 2013-02-26 10:40:24 -08:00
Dirk Dougherty
012ef92e03 Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 2013-02-26 18:36:11 +00:00