Matthew Xie
f8a67f4f5d
Merge "Make BluetoothGattServer.close() public" into jb-mr2-dev
2013-04-11 06:07:33 +00:00
Tim Murray
4e8a3bcf03
am 3eba934a: Merge "Clean up USAGE_SHARED and add syncing for USAGE_SHARED." into jb-mr2-dev
...
* commit '3eba934a2747f71fa0aba2e1949567c786265359':
Clean up USAGE_SHARED and add syncing for USAGE_SHARED.
2013-04-10 21:56:04 -07:00
Tim Murray
3eba934a27
Merge "Clean up USAGE_SHARED and add syncing for USAGE_SHARED." into jb-mr2-dev
2013-04-11 04:50:32 +00:00
Scott Main
9908c6744e
am ef0066a8: am bc80d99b: am 55aa87b2: am bd6b22d8: am 0cdbd5a5: am 1c2dea05: add meta tags to the rest of the training classes
...
* commit 'ef0066a8c35b29dcf308b8e51a664ce044e79f61':
add meta tags to the rest of the training classes
2013-04-10 19:35:55 -07:00
Scott Main
f2f5b6ef98
delete orphaned/redirected files
...
Change-Id: I6539076edf8962fd974d790a0edd1d4badc4d5f7
2013-04-10 19:31:56 -07:00
Scott Main
ef0066a8c3
am bc80d99b: am 55aa87b2: am bd6b22d8: am 0cdbd5a5: am 1c2dea05: add meta tags to the rest of the training classes
...
* commit 'bc80d99bd9bbf747b42137a24d63a17f71e276d2':
add meta tags to the rest of the training classes
2013-04-10 19:30:08 -07:00
Scott Main
bc80d99bd9
am 55aa87b2: am bd6b22d8: am 0cdbd5a5: am 1c2dea05: add meta tags to the rest of the training classes
...
* commit '55aa87b2b36359441c3acb4222980fda8ba2c980':
add meta tags to the rest of the training classes
2013-04-10 19:25:59 -07:00
Amith Yamasani
b6812eabd4
am f900647a: Merge "Don\'t sync from adapters that haven\'t opted in to restricted accounts" into jb-mr2-dev
...
* commit 'f900647aa823165676d2fe9bcfcfc078d99649ab':
Don't sync from adapters that haven't opted in to restricted accounts
2013-04-10 19:25:36 -07:00
Scott Main
55aa87b2b3
am bd6b22d8: am 0cdbd5a5: am 1c2dea05: add meta tags to the rest of the training classes
...
* commit 'bd6b22d8088df8d2c98e4d8f289ce0024164a1ad':
add meta tags to the rest of the training classes
2013-04-10 19:22:46 -07:00
Amith Yamasani
f900647aa8
Merge "Don't sync from adapters that haven't opted in to restricted accounts" into jb-mr2-dev
2013-04-11 02:21:37 +00:00
Scott Main
bd6b22d808
am 0cdbd5a5: am 1c2dea05: add meta tags to the rest of the training classes
...
* commit '0cdbd5a5b2b81cb5138ee62526689c2046b2a149':
add meta tags to the rest of the training classes
2013-04-10 19:19:14 -07:00
Scott Main
0cdbd5a5b2
am 1c2dea05: add meta tags to the rest of the training classes
...
* commit '1c2dea05492b23aa8f19c93fccedbe390e100297':
add meta tags to the rest of the training classes
2013-04-10 19:15:39 -07:00
Andre Eisenbach
3b64f38a16
Make BluetoothGattServer.close() public
...
This functino is needed for applications to un-register from the
Bluetooth stack.
bug 8591003
Change-Id: Id05f592245d1d90791d34c3617aadac67bc6502c
2013-04-10 19:13:10 -07:00
Adam Powell
90d8491df8
Permit null adapters in Spinners
...
Bug 8538144
Change-Id: I83f0ae78ce15f46827fb721cd0df1972b7d9d198
2013-04-10 19:08:24 -07:00
Mathias Agopian
fb01e4b634
Don't draw synchronously in onResume()
...
this could cause a dead-lock if the applicaltion's draw
implementation blocks until something happenson the main
ui thread.
note: we're still doing this synchronous draw in onWindowResize() because
that's what the previous implementation did. Technically, it has the
same problem.
Bug: 8586305
Change-Id: I782568289cc9419346aeea73775d86faa28b3058
2013-04-10 19:08:16 -07:00
Kristian Monsen
b5cd8c0a81
Fix for bug 8577776 Throw exception if app calls WebView used on wrong thread
...
Mostly copied and pasted from the bug report.
Change-Id: I57cd19961f51fce266025d76ad9273a24f629c5b
2013-04-10 19:04:40 -07:00
Scott Main
1c2dea0549
add meta tags to the rest of the training classes
...
Change-Id: I4db0acee547b198db754eaf0e78062614ac6f59a
2013-04-10 18:59:29 -07:00
Amith Yamasani
36f73e2539
am 9429afba: Fix a security check in getting app restrictions
...
* commit '9429afba06d96973ea4bf76abba945dd92a1debb':
Fix a security check in getting app restrictions
2013-04-10 18:47:01 -07:00
Amith Yamasani
9429afba06
Fix a security check in getting app restrictions
...
Change-Id: I02fbab8765d3f8646d0fe62ee867566d1d14707d
2013-04-10 18:40:51 -07:00
Jim Miller
9ddfeb83aa
Fix keyguard pattern invalidate bug
...
The framework used to invalidate both the previous invalidate
region and the current one. However, with change I9fb96f99
this is no longer the case (it was always true for software
rendering, but never showed because most platforms use
acceleration).
The fix is to invalidate the union of the old region and
the new region ourselves.
Fixes bug 8503031
Change-Id: If303e0892772dd9d6915efa55118d054a742c1a5
2013-04-10 18:15:30 -07:00
Jamie Gennis
5800fc881e
Trace: unhide app tracing APIs
...
Change-Id: I48316623fe0394d3fe77e9abca3f6dbf791d0c08
2013-04-10 17:50:32 -07:00
Amith Yamasani
399a2977a5
am b3a98725: Merge "Show an error dialog when account type is requested on a limited user" into jb-mr2-dev
...
* commit 'b3a9872549137f6c3983609e48e5b2d4fc94a3d4':
Show an error dialog when account type is requested on a limited user
2013-04-10 17:33:35 -07:00
Amith Yamasani
b3a9872549
Merge "Show an error dialog when account type is requested on a limited user" into jb-mr2-dev
2013-04-11 00:27:49 +00:00
Jim Miller
3ef8f64d3f
am 5c58a916: Merge "Fix missing clock in keyguard" into jb-mr2-dev
...
* commit '5c58a916f6b10652af02aa357ceb70ba2cd18363':
Fix missing clock in keyguard
2013-04-10 17:22:20 -07:00
Jim Miller
5c58a916f6
Merge "Fix missing clock in keyguard" into jb-mr2-dev
2013-04-11 00:16:39 +00:00
Amith Yamasani
9422bdca31
Don't sync from adapters that haven't opted in to restricted accounts
...
SyncManager should not allow syncing of data from apps that haven't opted
in to viewing restricted accounts in limited users.
Override getIsSyncable() to check if the sync adapter has the manifest
entry to enable restricted accounts of that account type. Return the default
isSyncable state if the adapter has opted in, otherwise return 0 for false.
Bug: 8566533
Change-Id: I3777f1e4fdb8debe1724ab083272e2d9bd2e63f2
2013-04-10 17:06:02 -07:00
Christopher Tate
04f5c8cb95
am 790518a1: Merge "Implicitly enable system apps when updates installed" into jb-mr2-dev
...
* commit '790518a1a2f06030d19fdd896bd0f80dd03d94fc':
Implicitly enable system apps when updates installed
2013-04-10 17:04:46 -07:00
Christopher Tate
790518a1a2
Merge "Implicitly enable system apps when updates installed" into jb-mr2-dev
2013-04-10 23:58:37 +00:00
Craig Mautner
98874efb99
am cc979c9e: Merge "Debug logging improvement." into jb-mr2-dev
...
* commit 'cc979c9eae387d80e4c4129d18991d708dde44a6':
Debug logging improvement.
2013-04-10 16:57:50 -07:00
Craig Mautner
cc979c9eae
Merge "Debug logging improvement." into jb-mr2-dev
2013-04-10 23:54:29 +00:00
Raph Levien
b2c8dca1b4
am 81c8de3a: Merge "Fix for bug 8574856 - bad metrics in Roboto Italic" into jb-mr2-dev
...
* commit '81c8de3a3c2ce26866afd4e003c1739627a398e1':
Fix for bug 8574856 - bad metrics in Roboto Italic
2013-04-10 16:28:25 -07:00
Raph Levien
81c8de3a3c
Merge "Fix for bug 8574856 - bad metrics in Roboto Italic" into jb-mr2-dev
2013-04-10 23:24:17 +00:00
Adam Powell
66104e1e19
am 521eeaef: Merge "Make MediaRouter ignore remembered wifi displays when wifi display is off" into jb-mr2-dev
...
* commit '521eeaefcb4b78a8b571d1a1b4f095d993aea8b6':
Make MediaRouter ignore remembered wifi displays when wifi display is off
2013-04-10 16:13:01 -07:00
Jim Miller
e5fb5e4c4d
Fix missing clock in keyguard
...
This fixes a bug where the clock sometimes doesn't show due to the
alpha values not being reset when the widget page order changes
due to removing a widget.
Fixes bug 8545025.
Change-Id: I17c531af4c844647b3262fcf56faa84fff8bafc5
2013-04-10 16:10:06 -07:00
Michael Wright
af543eb050
am 8881455a: Merge "Send joystick key repeat messages to correct handler" into jb-mr2-dev
...
* commit '8881455af119762a25d4548384322b8e4a2023dd':
Send joystick key repeat messages to correct handler
2013-04-10 16:09:25 -07:00
Adam Powell
521eeaefcb
Merge "Make MediaRouter ignore remembered wifi displays when wifi display is off" into jb-mr2-dev
2013-04-10 23:08:47 +00:00
Adam Powell
615e413a90
Make MediaRouter ignore remembered wifi displays when wifi display is off
...
Bug 8417329
Change-Id: Ica9bf1b250be4b72ba32e63d7eb1a6ff0b727961
2013-04-10 16:04:59 -07:00
Michael Wright
8881455af1
Merge "Send joystick key repeat messages to correct handler" into jb-mr2-dev
2013-04-10 23:04:13 +00:00
Santos Cordon
0a5eb3eca7
am acd840d5: Merge "Obfuscate any phone numbers that pass through the event log." into jb-mr2-dev
...
* commit 'acd840d5c31bee48cc13a03f5e0c5e3b69ff23db':
Obfuscate any phone numbers that pass through the event log.
2013-04-10 15:57:07 -07:00
Santos Cordon
acd840d5c3
Merge "Obfuscate any phone numbers that pass through the event log." into jb-mr2-dev
2013-04-10 22:53:08 +00:00
Jeff Sharkey
1153a302b6
Enforce READ_EXTERNAL_STORAGE on emulator.
...
Bug: 7203378
Change-Id: Iecc6e3caebfad714f8f6de6d036644c57e88a1af
2013-04-10 15:42:13 -07:00
Amith Yamasani
23c8b96a7e
Show an error dialog when account type is requested on a limited user
...
This covers the scenario where an app doesn't find an account of the
required type and requests the account manager to add one of that
type.
Bug: 8537648
Change-Id: I4d9c8842c2d90aa668f16034d3db007dc61714b8
2013-04-10 15:36:54 -07:00
Jaikumar Ganesh
7228e1aeb9
am 8ce470dd: GPS Hardware geofencing.
...
* commit '8ce470dd4ba0608abb6b5eae117cefca927af96b':
GPS Hardware geofencing.
2013-04-10 15:34:35 -07:00
Craig Mautner
66d7730903
Debug logging improvement.
...
Previously a change to a surface would be logged with the old value
and you had to scroll through the logs to see what the new value
was. This change reflects the change to the surface immediately.
Change-Id: I2a6566466287922d08f4ce2329c61aa46d692ee1
2013-04-10 15:33:26 -07:00
Robert Greenwalt
a9bebc2211
Use CONNECTIVITY_INTERNAL for global proxy
...
The Global http proxy shouldn't be used by apps, but can be useful in certain
conditions.
bug:8264794
bug:8557674
Change-Id: Ia3cbe542e448d9e74d0492626a13e9fd34ad797a
2013-04-10 15:32:18 -07:00
The Android Open Source Project
04958d1543
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Idf48718630a3b4260b530f26d8f8f26b3d2e1e5c
2013-04-10 15:31:38 -07:00
Jaikumar Ganesh
8ce470dd4b
GPS Hardware geofencing.
...
Add support for doing geofencing in hardware.
Change-Id: I6d5015190e8d84e1f4beb1010ed977a71c1622d0
2013-04-10 15:25:07 -07:00
Adam Powell
4348fcddda
am 8d06cc6d: Merge "Permit null adapters in Spinners" into jb-mr2-dev
...
* commit '8d06cc6d871fce6d5d6b6283027d4625edd92550':
Permit null adapters in Spinners
2013-04-10 15:24:31 -07:00
Michael Wright
b9618523ad
Send joystick key repeat messages to correct handler
...
Change-Id: I7f8dbe21c9088553ad2c5efe70585f516ab78141
2013-04-10 15:20:56 -07:00
Adam Powell
8d06cc6d87
Merge "Permit null adapters in Spinners" into jb-mr2-dev
2013-04-10 22:17:31 +00:00