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

101122 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dianne Hackborn
1bf1af60a3 Add documentation for overscan flag. 
Change-Id: Ibed06f23b2011a66021344384150e9d4ba6e61ed
 2013-02-26 10:36:10 -08:00
Dianne Hackborn
305dbea8e3 Merge "App ops: adding operations for reading/writing clipboard." into jb-mr2-dev 2013-02-26 18:16:22 +00:00
Dianne Hackborn
4b141acde0 Merge "Add Bundle APIs for putting/getting Binder objects." into jb-mr2-dev 2013-02-26 18:10:32 +00:00
Elliott Hughes
6c8cd01ad5 am c22657f8: am 3f5778c8: Merge "Fix incorrect FloatMath documentation." 
* commit 'c22657f8b1e3b9198f1e7795a06a6f59b5cd9c80':
  Fix incorrect FloatMath documentation.
 2013-02-26 18:04:35 +00:00
Kenny Root
c2235472da am f7497c9e: am 755205ad: Merge "Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help"" 
* commit 'f7497c9e551dd3bcbb7438211f5022cc6341c527':
  Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help"
 2013-02-26 18:04:33 +00:00
Elliott Hughes
c22657f8b1 am 3f5778c8: Merge "Fix incorrect FloatMath documentation." 
* commit '3f5778c858b90b554d7614603346b642d1a7bc6d':
  Fix incorrect FloatMath documentation.
 2013-02-26 10:02:45 -08:00
Kenny Root
f7497c9e55 am 755205ad: Merge "Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help"" 
* commit '755205ade42d6458c68bf1ee6852db0b23ecc4f5':
  Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help"
 2013-02-26 10:02:43 -08:00
Scott Main
1649f818e2 docs: add MTK usb driver info 
Change-Id: I847877e65207d065883e7ab74be65b6333ca205d
 2013-02-26 09:45:13 -08:00
Elliott Hughes
3f5778c858 Merge "Fix incorrect FloatMath documentation." 2013-02-26 17:37:58 +00:00
Kenny Root
755205ade4 Merge "Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help"" 2013-02-26 17:35:13 +00:00
Elliott Hughes
f732a2f83f Fix incorrect FloatMath documentation. 
Change-Id: I30bbe500e634b73f3456ccc797106ad261fd0ce7
 2013-02-26 09:28:17 -08:00
Irfan Sheriff
9fbdda42a2 Merge "Fix leak in WifiManager" into jb-mr2-dev 2013-02-26 17:04:58 +00:00
Irfan Sheriff
302b06de7e Fix leak in WifiManager 
Avoid leaks from having a channel connection per manager instance

Bug: 8254124
Change-Id: I10de91d7e5a775bc14bbab245734717d3b2f90d5
 2013-02-26 09:01:48 -08:00
Martin Olsson
64d0b3f918 Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help" 
Change-Id: I8f869c9d2243ae8ff414399b7d6835c7ca74d500
Signed-off-by: Martin Olsson <martin@minimum.se>
 2013-02-26 17:54:39 +01:00
The Android Automerger
c67dcfae73 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-02-26 08:50:51 -08:00
Daniel Sandler
30a51b3f01 Merge "Spurious file removed." into jb-mr2-dev 2013-02-26 16:41:16 +00:00