Romain Guy
886e120460
am 8d4c23b9: Merge "Introduce PixelBuffer API to enable PBOs" into jb-mr2-dev
...
* commit '8d4c23b9c32f8c0328ebca538bb801716fe4478a':
Introduce PixelBuffer API to enable PBOs
2013-04-12 10:37:05 -07:00
Romain Guy
8d4c23b9c3
Merge "Introduce PixelBuffer API to enable PBOs" into jb-mr2-dev
2013-04-12 17:31:26 +00:00
Scott Main
5a0c8a426e
am 737a3611: am d6c7d6a7: am 8b3516e0: am 600d40a6: am 2545e285: am 4dd4c697: Merge "add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81" into jb-mr1.1-docs
...
* commit '737a3611038d6e3b114538335001525e7ad2b5da':
add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81
2013-04-12 10:25:44 -07:00
Scott Main
737a361103
am d6c7d6a7: am 8b3516e0: am 600d40a6: am 2545e285: am 4dd4c697: Merge "add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81" into jb-mr1.1-docs
...
* commit 'd6c7d6a7e33da6f182ff138227fecc924b3c6e21':
add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81
2013-04-12 10:20:31 -07:00
Scott Main
d6c7d6a7e3
am 8b3516e0: am 600d40a6: am 2545e285: am 4dd4c697: Merge "add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81" into jb-mr1.1-docs
...
* commit '8b3516e0bba2b3ecf46b3ca8f7c459e3f8b2ac7c':
add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81
2013-04-12 10:18:39 -07:00
Scott Main
8b3516e0bb
am 600d40a6: am 2545e285: am 4dd4c697: Merge "add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81" into jb-mr1.1-docs
...
* commit '600d40a6a523557748103dc536458fdb35d2c52c':
add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81
2013-04-12 10:16:34 -07:00
Scott Main
600d40a6a5
am 2545e285: am 4dd4c697: Merge "add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81" into jb-mr1.1-docs
...
* commit '2545e2856308b86449842638d1915d434a1a7ac9':
add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81
2013-04-12 10:14:43 -07:00
Scott Main
dc1ebec782
am 43d44621: am 8d53821d: am 46a1b362: am 657d7b8c: am 4f4d243d: am 64461bf4: doc tags for api guides and delete a useless file
...
* commit '43d446218dca5f1d7dd4c523782b5e5b0b72cd02':
doc tags for api guides and delete a useless file
2013-04-12 10:13:33 -07:00
Scott Main
2545e28563
am 4dd4c697: Merge "add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81" into jb-mr1.1-docs
...
* commit '4dd4c697bcc6f69c333b68a3e1c63e4e03a3c1dc':
add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81
2013-04-12 10:11:35 -07:00
Scott Main
43d446218d
am 8d53821d: am 46a1b362: am 657d7b8c: am 4f4d243d: am 64461bf4: doc tags for api guides and delete a useless file
...
* commit '8d53821d055a826f7b6745ab17769308df5eb547':
doc tags for api guides and delete a useless file
2013-04-12 10:10:57 -07:00
Kenny Root
6fd1c85d7f
Remove keystore entries when app data cleared
...
When an application's user data is cleared, the keystore entries need to
be cleared as well. Previously we were only clearing entries when the
application was uninstalled for all users. Now we cover the case of
multiuser as well.
Bug: 8566369
Change-Id: I201c92d0893f0d18e87970dcd59ef6cd904584dc
2013-04-12 10:09:02 -07:00
Scott Main
4dd4c697bc
Merge "add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81" into jb-mr1.1-docs
2013-04-12 17:08:08 +00:00
Scott Main
8d53821d05
am 46a1b362: am 657d7b8c: am 4f4d243d: am 64461bf4: doc tags for api guides and delete a useless file
...
* commit '46a1b362dbbee0feaa395e6014b8c086ed54d7e0':
doc tags for api guides and delete a useless file
2013-04-12 10:08:06 -07:00
Scott Main
46a1b362db
am 657d7b8c: am 4f4d243d: am 64461bf4: doc tags for api guides and delete a useless file
...
* commit '657d7b8cbce5cdbd5d30cca56ab009e672373470':
doc tags for api guides and delete a useless file
2013-04-12 10:04:14 -07:00
Scott Main
657d7b8cbc
am 4f4d243d: am 64461bf4: doc tags for api guides and delete a useless file
...
* commit '4f4d243d699d37310a914606fb4e5fc09ba9fc00':
doc tags for api guides and delete a useless file
2013-04-12 10:00:10 -07:00
Scott Main
4f4d243d69
am 64461bf4: doc tags for api guides and delete a useless file
...
* commit '64461bf4f261164cb9e3022761fd217fd0028ac5':
doc tags for api guides and delete a useless file
2013-04-12 09:56:55 -07:00
Scott Main
64461bf4f2
doc tags for api guides
...
and delete a useless file
Change-Id: If6d2b77c9a2e6d473c4a473f7bd896aa35499938
2013-04-12 09:09:46 -07:00
Baligh Uddin
66e3763aa0
Import translations. DO NOT MERGE
...
Change-Id: I15a73679c695e77f03a10c9145c13055fa2472b1
Auto-generated-cl: translation import
2013-04-12 08:55:42 -07:00
Baligh Uddin
51d2a4359b
Import translations. DO NOT MERGE
...
Change-Id: I10fbc89bea48711ace448934bab2aacf6afd9549
Auto-generated-cl: translation import
2013-04-12 08:47:44 -07:00
Tim Murray
e1f8089a94
am 5c18ff0f: am 869d2735: Merge "Fix issues with GC thread." into jb-mr2-dev
...
* commit '5c18ff0f2b9eab8481acfe13603e253e9c16fb32':
Fix issues with GC thread.
2013-04-12 00:10:47 -07:00
Tim Murray
5c18ff0f2b
am 869d2735: Merge "Fix issues with GC thread." into jb-mr2-dev
...
* commit '869d273503adbccfae3bac7425649f2e1d2aefad':
Fix issues with GC thread.
2013-04-12 00:07:01 -07:00
Tim Murray
869d273503
Merge "Fix issues with GC thread." into jb-mr2-dev
2013-04-12 07:04:08 +00:00
Svetoslav
3ba01a7cc3
am 9d02928e: am 14c8c741: Merge "Adding APIs for an accessibility service to intercept key events." into jb-mr2-dev
...
* commit '9d02928e4349cecfa14e195d3d6f40e68c5fc468':
Adding APIs for an accessibility service to intercept key events.
2013-04-11 22:51:09 -07:00
Svetoslav
9d02928e43
am 14c8c741: Merge "Adding APIs for an accessibility service to intercept key events." into jb-mr2-dev
...
* commit '14c8c741f79983578a8e9c5124d142c6d85ab91b':
Adding APIs for an accessibility service to intercept key events.
2013-04-11 22:48:39 -07:00
Svetoslav
14c8c741f7
Merge "Adding APIs for an accessibility service to intercept key events." into jb-mr2-dev
2013-04-12 05:45:43 +00:00
Irfan Sheriff
2c86df3196
am 91983320: am 35182905: Merge "Fix WPS handling when already connected" into jb-mr2-dev
...
* commit '919833207622fed1bf3c36f13c46493d92f9e5b6':
Fix WPS handling when already connected
2013-04-11 22:12:16 -07:00
Irfan Sheriff
9198332076
am 35182905: Merge "Fix WPS handling when already connected" into jb-mr2-dev
...
* commit '35182905df4d1adb973621af61c831439f0b929b':
Fix WPS handling when already connected
2013-04-11 22:08:40 -07:00
Irfan Sheriff
35182905df
Merge "Fix WPS handling when already connected" into jb-mr2-dev
2013-04-12 05:05:11 +00:00
Tim Murray
6dacf8355a
Fix issues with GC thread.
...
bug 8600533
Change-Id: I356902ee9897daeb2c1090815beeb572234c81e7
2013-04-11 22:04:26 -07:00
Kristian Monsen
bdd97e02ec
am 3b9e272e: am 83b00258: Merge "Fix for bug 8577776 Throw exception if app calls WebView used on wrong thread" into jb-mr2-dev
...
* commit '3b9e272e0e2f01d55e67c68dbf5b6e9d895508f4':
Fix for bug 8577776 Throw exception if app calls WebView used on wrong thread
2013-04-11 21:57:31 -07:00
Kristian Monsen
3b9e272e0e
am 83b00258: Merge "Fix for bug 8577776 Throw exception if app calls WebView used on wrong thread" into jb-mr2-dev
...
* commit '83b002584ce27e3f405d224c0ce83d69516f87d8':
Fix for bug 8577776 Throw exception if app calls WebView used on wrong thread
2013-04-11 21:53:52 -07:00
Kristian Monsen
83b002584c
Merge "Fix for bug 8577776 Throw exception if app calls WebView used on wrong thread" into jb-mr2-dev
2013-04-12 04:50:20 +00:00
Jeff Brown
b97ebedeb3
am dc5711ea: am bf26c9cf: Merge "Ensure looper quits after all other messages are handled." into jb-mr2-dev
...
* commit 'dc5711eaef8662d5299f0088edf6e47fff77a872':
Ensure looper quits after all other messages are handled.
2013-04-11 21:11:08 -07:00
Jeff Brown
dc5711eaef
am bf26c9cf: Merge "Ensure looper quits after all other messages are handled." into jb-mr2-dev
...
* commit 'bf26c9cf87d3b83723fd12f4678b8b4286d8d08a':
Ensure looper quits after all other messages are handled.
2013-04-11 21:08:38 -07:00
Irfan Sheriff
01dfa12142
am c7512057: am 5f2f3dfe: Merge "Fix proxy and IP settings" into jb-mr2-dev
...
* commit 'c7512057feed983cf0eeb87f02f73426bfef5336':
Fix proxy and IP settings
2013-04-11 21:06:38 -07:00
Jeff Brown
bf26c9cf87
Merge "Ensure looper quits after all other messages are handled." into jb-mr2-dev
2013-04-12 04:05:40 +00:00
Irfan Sheriff
c7512057fe
am 5f2f3dfe: Merge "Fix proxy and IP settings" into jb-mr2-dev
...
* commit '5f2f3dfeaffc9350b6913ceaf98e95c9f5dd5852':
Fix proxy and IP settings
2013-04-11 21:03:03 -07:00
Irfan Sheriff
5f2f3dfeaf
Merge "Fix proxy and IP settings" into jb-mr2-dev
2013-04-12 03:59:37 +00:00
Jason Sams
5a15136572
am 4e9ce36e: am c876cc49: Fix docs typo in YUV code
...
* commit '4e9ce36ee03a2a27f6f80c460385a748566cde41':
Fix docs typo in YUV code
2013-04-11 20:47:25 -07:00
Jason Sams
4e9ce36ee0
am c876cc49: Fix docs typo in YUV code
...
* commit 'c876cc49947332a538d23d28eca25a76b8f33e93':
Fix docs typo in YUV code
2013-04-11 20:44:57 -07:00
Jeff Brown
024136f57e
Ensure looper quits after all other messages are handled.
...
Bug: 8596303
Change-Id: Ie8bfbbe810f5ade2afd870c8e675ce1353a80e5d
2013-04-11 20:40:04 -07:00
Jason Sams
c876cc4994
Fix docs typo in YUV code
...
bug 8566866
Change-Id: I9da6d237b0a109b2c0799a41e531a0344cc19d40
2013-04-11 20:22:31 -07:00
Craig Mautner
26a84dfdd0
Clear test rectangle if previous focus is null.
...
A bug in FolderEditText or DynamicLayout (b/8600683) was causing
the 'rectangle' parameter passed to scrollToRectOrFocus() to be
roughly 1000 feet to the right of the screen.
This bug is normally masked because the focus found in
mLastScrolledFocus never matches the new focus and consequently
the misleading 'rectangle' is nulled. However, on the first
time in to scrollToRectOrFocus when returning to Launcher
from another app, mLastScrolledFocus is null and the code
skips over the place where 'rectangle' is nulled. Without this
clearing it was determined that 'rectangle' was outside the viewable
area and scrolling not required. This is bug 8547155.
This change causes even null values of mLastScrollFocus to be
compared to the new focus thus masking the bug in all situations.
Bug 8600683 will be fixed in a separate CL.
Fixes bug 8547155.
Change-Id: Ic6cb22c42b0e93a9793dd2babc25727c2ba29155
2013-04-11 19:33:54 -07:00
Jason Sams
ca22277d33
am d4b1b98d: am a2f289a4: Merge "USAGE_IO_INPUT buffer notifications" into jb-mr2-dev
...
* commit 'd4b1b98dfd9090cf8ccf7e713d0cca9049cb10a2':
USAGE_IO_INPUT buffer notifications
2013-04-11 19:27:15 -07:00
Jason Sams
d4b1b98dfd
am a2f289a4: Merge "USAGE_IO_INPUT buffer notifications" into jb-mr2-dev
...
* commit 'a2f289a40db821c1961e16c2f4acc5785dbb3394':
USAGE_IO_INPUT buffer notifications
2013-04-11 19:23:52 -07:00
Jason Sams
a2f289a40d
Merge "USAGE_IO_INPUT buffer notifications" into jb-mr2-dev
2013-04-12 02:20:11 +00:00
Scott Main
21fe719dbe
add redirects to match changes in I1cac3419835fe8402d416c14eb11652c89b0dd81
...
Change-Id: Ie8b9c48c9430e3aebaffbfb79f6774f6748db5d2
2013-04-11 19:14:13 -07:00
Geremy Condra
c797b40ade
am 64ef8ed8: am 68913baf: Merge "Remove /data/system location for mac_permissions.xml."
...
* commit '64ef8ed88c435108bec7f780fb9d8378422c5751':
Remove /data/system location for mac_permissions.xml.
2013-04-11 19:07:49 -07:00
Geremy Condra
64ef8ed88c
am 68913baf: Merge "Remove /data/system location for mac_permissions.xml."
...
* commit '68913baf72832226c0788bdba885e92e186cc2d8':
Remove /data/system location for mac_permissions.xml.
2013-04-11 19:05:10 -07:00
Christopher Tate
58c15bfcdf
am f6a2503d: am 5adae45a: Merge "Document the behavior of \'null\' values in SharedPreferences" into jb-mr2-dev
...
* commit 'f6a2503d4ad50e22d0e32ade59bb0f73fae5273f':
Document the behavior of 'null' values in SharedPreferences
2013-04-11 18:47:14 -07:00