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
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
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
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
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
f6a2503d4a
am 5adae45a: Merge "Document the behavior of \'null\' values in SharedPreferences" into jb-mr2-dev
...
* commit '5adae45addad702de4393a68b6236b1d528c58d6':
Document the behavior of 'null' values in SharedPreferences
2013-04-11 18:43:20 -07:00
Christopher Tate
5adae45add
Merge "Document the behavior of 'null' values in SharedPreferences" into jb-mr2-dev
2013-04-12 01:41:01 +00:00
Dianne Hackborn
26c702c395
am ba880da4: Merge "Fix issue #7643046 : Activity.getCallingPackage() bogusly returns null..." into jb-mr2-dev
...
* commit 'ba880da44c672e64f76a593ed96e514a56bc7c56':
Fix issue #7643046 : Activity.getCallingPackage() bogusly returns null...
2013-04-11 18:32:40 -07:00
Dianne Hackborn
ba880da44c
Merge "Fix issue #7643046 : Activity.getCallingPackage() bogusly returns null..." into jb-mr2-dev
2013-04-12 01:29:14 +00:00
Geremy Condra
68913baf72
Merge "Remove /data/system location for mac_permissions.xml."
2013-04-12 01:18:51 +00:00
Jason Sams
739c8263a1
USAGE_IO_INPUT buffer notifications
...
Change-Id: I6ec0508089029da9ed118127f0c13b7b189ef5e9
2013-04-11 18:14:26 -07:00
Dianne Hackborn
7b92467179
Fix issue #7643046 : Activity.getCallingPackage() bogusly returns null...
...
...after having to recreate the task stack
Change-Id: Ia354240f3650ddb578f2116a2aa4584e9ffe8508
2013-04-11 18:12:56 -07:00
Fabrice Di Meglio
70d2c77320
am f5c757c6: Merge "More fix for bug #8159072 Spinner widget should be RTL\'ized" into jb-mr2-dev
...
* commit 'f5c757c6292fb2623757ef73020d3730ead063d7':
More fix for bug #8159072 Spinner widget should be RTL'ized
2013-04-11 18:07:06 -07:00
Fabrice Di Meglio
f5c757c629
Merge "More fix for bug #8159072 Spinner widget should be RTL'ized" into jb-mr2-dev
2013-04-12 01:03:33 +00:00
Dianne Hackborn
bc708d8b9d
am c309ca46: Merge "Fix issue #8582003 : Evernote Camera Capture Failure" into jb-mr2-dev
...
* commit 'c309ca4622833bf47b57366ae038500023de1668':
Fix issue #8582003 : Evernote Camera Capture Failure
2013-04-11 18:01:30 -07:00
Dianne Hackborn
c309ca4622
Merge "Fix issue #8582003 : Evernote Camera Capture Failure" into jb-mr2-dev
2013-04-12 00:58:24 +00:00
Fabrice Di Meglio
4febbf3501
am bd286426: Merge "Fix bug #8599905 Add simple BidiFormatter getInstance() helper API" into jb-mr2-dev
...
* commit 'bd286426fae833ddbef0646b267e2a31eee4939b':
Fix bug #8599905 Add simple BidiFormatter getInstance() helper API
2013-04-11 17:48:39 -07:00
Fabrice Di Meglio
bd286426fa
Merge "Fix bug #8599905 Add simple BidiFormatter getInstance() helper API" into jb-mr2-dev
2013-04-12 00:46:07 +00:00
Dianne Hackborn
b57a50bd16
Fix issue #8582003 : Evernote Camera Capture Failure
...
ActivityThread.currentPackageName() was actually returning
the process name. Change this to return the package name, and
fix the one spot using it I could find that was actually wanting
the process name.
Change-Id: I323b9c5987106b5a090968e545281fc0ba55b6b8
2013-04-11 17:29:32 -07:00
Dianne Hackborn
d9d9c17dda
am 77216642: Merge "Implement #7341342 API request: way to determine current orientation..." into jb-mr2-dev
...
* commit '77216642884d5131290803776b0fce4d68128e97':
Implement #7341342 API request: way to determine current orientation...
2013-04-11 17:11:21 -07:00
Dianne Hackborn
7721664288
Merge "Implement #7341342 API request: way to determine current orientation..." into jb-mr2-dev
2013-04-12 00:08:13 +00:00
Dianne Hackborn
b9ec1ac51b
Implement #7341342 API request: way to determine current orientation...
...
...to allow for orientation locking
This doesn't add an API to get the current orientation, since that is
inherantly racy. Instead there is a new "locked" orientation mode that
locks the screen into whatever the current rotation is.
While at it, added a few other useful orientation modes.
Change-Id: I5c369e6511cb72294e9e922ea8acffd770df9440
2013-04-11 17:07:40 -07:00
Robert Greenwalt
5ec50ebd9a
am b7e6a443: Merge "Routing workaround." into jb-mr2-dev
...
* commit 'b7e6a4433bda6c59540ffc51061aff5cc3d10166':
Routing workaround.
2013-04-11 16:29:38 -07:00
Robert Greenwalt
b7e6a4433b
Merge "Routing workaround." into jb-mr2-dev
2013-04-11 23:27:20 +00:00
Fabrice Di Meglio
cd5af79bf9
Fix bug #8599905 Add simple BidiFormatter getInstance() helper API
...
Change-Id: I85ff074904025c724409ccc52bc82a1fd23803de
2013-04-11 16:25:21 -07:00
Christopher Tate
9a413f8ffa
Document the behavior of 'null' values in SharedPreferences
...
Bug 7892422
Change-Id: Ib898fd0921d57871d4caecb9042c479271c7ad60
2013-04-11 16:01:18 -07:00
Jim Miller
cda712266f
am eec68e55: Merge "Fix keyguard pattern invalidate bug" into jb-mr2-dev
...
* commit 'eec68e55cc6661837030c8ecb4386d05b1d31685':
Fix keyguard pattern invalidate bug
2013-04-11 15:41:03 -07:00
Jim Miller
cce961c134
am 22626107: Merge "Fix bug where transport shows all the time in keyguard" into jb-mr2-dev
...
* commit '22626107841e928d472e8258c0d2cefccf9c9b81':
Fix bug where transport shows all the time in keyguard
2013-04-11 15:40:59 -07:00
Jim Miller
eec68e55cc
Merge "Fix keyguard pattern invalidate bug" into jb-mr2-dev
2013-04-11 22:37:59 +00:00
Jim Miller
2262610784
Merge "Fix bug where transport shows all the time in keyguard" into jb-mr2-dev
2013-04-11 22:37:34 +00:00
Jeff Sharkey
ce6d3ed612
am 6f0a36e6: Merge "Enforce READ_EXTERNAL_STORAGE on emulator." into jb-mr2-dev
...
* commit '6f0a36e691fd4c434a80631e4dda212d35745d83':
Enforce READ_EXTERNAL_STORAGE on emulator.
2013-04-11 15:19:38 -07:00
Jeff Sharkey
6f0a36e691
Merge "Enforce READ_EXTERNAL_STORAGE on emulator." into jb-mr2-dev
2013-04-11 22:16:51 +00:00
Irfan Sheriff
51e4ece385
Fix proxy and IP settings
...
- Network disconnect was clobbering IP and proxy settings.
- Track settings correctly in WifiConfigStore
Bug: 7299216
Change-Id: I30e5b68e59e30f7b99a71e8d7cf18750c784cec7
2013-04-11 15:12:20 -07:00
Benjamin Poiesz
b3ebc306c2
am fc9f07dd: Merge "Adding LocalePicker support for the zz_ZZ pseudolocale" into jb-mr2-dev
...
* commit 'fc9f07dd4b6a900606c51cb67bedfbfe9de6e6d5':
Adding LocalePicker support for the zz_ZZ pseudolocale
2013-04-11 15:06:30 -07:00
Benjamin Poiesz
fc9f07dd4b
Merge "Adding LocalePicker support for the zz_ZZ pseudolocale" into jb-mr2-dev
2013-04-11 22:04:01 +00:00
Robert Greenwalt
63582a790e
am ccbe7e6f: Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-dev
...
* commit 'ccbe7e6ff16fe1afc08f0b8601d83481ba5aee3a':
Use CONNECTIVITY_INTERNAL for global proxy
2013-04-11 14:16:28 -07:00
Robert Greenwalt
ccbe7e6ff1
Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-dev
2013-04-11 21:11:44 +00:00
Benjamin Poiesz
39f96f95c3
Adding LocalePicker support for the zz_ZZ pseudolocale
...
Bug #8556677
Change-Id: I47244765b240f1ba66eadbef4ac712cf4367566e
2013-04-11 13:49:54 -07:00
Fabrice Di Meglio
dc25d25333
More fix for bug #8159072 Spinner widget should be RTL'ized
...
- fix DrawableContainerState.getChangingConfigurations() to take care about its children
- make Resources.verifyPreloadConfig() return false when the changing configuration
contains layout direction bits (this is when a Drawable is having different version
for LTR and RTL layout directions)
- use constant state instead of the resource type value for checking if we can
preload the drawable
- fix typo
Change-Id: Idd64caf0fbe0f5cfd5ffe09343e84bafa9446ea5
2013-04-11 13:38:57 -07:00
Nick Kralevich
c5931edb4c
am c65e4633: Merge "Optional <uses-permission> not yet supported." into jb-mr2-dev
...
* commit 'c65e463356e9c8b646e80d0bfb6cfc76a0a1b426':
Optional <uses-permission> not yet supported.
2013-04-11 13:01:27 -07:00
Nick Kralevich
c65e463356
Merge "Optional <uses-permission> not yet supported." into jb-mr2-dev
2013-04-11 19:56:55 +00:00
Jamie Gennis
8a675b9aca
am 6e8a2dd3: Merge "Trace: unhide app tracing APIs" into jb-mr2-dev
...
* commit '6e8a2dd3e66e65008a70fc09f6532b231d9b5f27':
Trace: unhide app tracing APIs
2013-04-11 12:50:10 -07:00
Jamie Gennis
6e8a2dd3e6
Merge "Trace: unhide app tracing APIs" into jb-mr2-dev
2013-04-11 19:47:25 +00:00
Scott Main
2f8caf6a74
am dac80f63: Merge "add api level 18 to javadoc \'since\' tags" into jb-mr2-dev
...
* commit 'dac80f633977308ec87cca1dea802e81d0fb75ad':
add api level 18 to javadoc 'since' tags
2013-04-11 12:03:54 -07:00
Scott Main
dac80f6339
Merge "add api level 18 to javadoc 'since' tags" into jb-mr2-dev
2013-04-11 19:01:01 +00:00