Kenny Root
a3788b00bb
keystore: Add flag for blobs to be unencrypted
...
In order to let apps use keystore more productively, make the blob
encryption optional. As more hardware-assisted keystores (i.e., hardware
that has a Keymaster HAL) come around, encrypting blobs start to make
less sense since the thing it's encrypting is usually a token and not
any raw key material.
Bug: 8122243
Change-Id: If9af0d992d68edec006e630c687df3d03a7c9608
2013-04-10 23:36:13 -07:00
Matthew Xie
f8a67f4f5d
Merge "Make BluetoothGattServer.close() public" into jb-mr2-dev
2013-04-11 06:07:33 +00: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
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
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
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
9429afba06
Fix a security check in getting app restrictions
...
Change-Id: I02fbab8765d3f8646d0fe62ee867566d1d14707d
2013-04-10 18:40:51 -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
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
790518a1a2
Merge "Implicitly enable system apps when updates installed" into jb-mr2-dev
2013-04-10 23:58:37 +00:00
Craig Mautner
cc979c9eae
Merge "Debug logging improvement." into jb-mr2-dev
2013-04-10 23:54:29 +00: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
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
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
acd840d5c3
Merge "Obfuscate any phone numbers that pass through the event log." into jb-mr2-dev
2013-04-10 22:53:08 +00: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
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
Jaikumar Ganesh
8ce470dd4b
GPS Hardware geofencing.
...
Add support for doing geofencing in hardware.
Change-Id: I6d5015190e8d84e1f4beb1010ed977a71c1622d0
2013-04-10 15:25:07 -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
Raph Levien
98082fa98b
Fix for bug 8574856 - bad metrics in Roboto Italic
...
The last update to Roboto Italic has a stray point in delta.alt with a
y value of -11299. This causes metrics to give too much vertical space
in some cases.
This is a "hot patch" fix, with the stray point deleted using TTX. We
want to fix the font upstream as well, but this should fix things in
the mean time.
Change-Id: I08edae96f69753b2d46dfc3fd1cc3b9176dcb5ad
2013-04-10 14:51:06 -07:00
Mathias Agopian
26cbb80600
Merge "Don't draw synchronously in onResume()" into jb-mr2-dev
2013-04-10 21:40:44 +00:00
Joe Fernandez
767e8747b4
am 0b6162e1: am 3f156d73: am 12ee56aa: am 5f27b486: am 53bbb4ff: Merge "docs: OpenGL Dev Guide, fix bug: 6104328" into jb-mr1.1-docs
...
* commit '0b6162e148db58ff8f8a5f0a3422933cd0005216':
docs: OpenGL Dev Guide, fix bug: 6104328
2013-04-10 14:30:17 -07:00
Joe Fernandez
0b6162e148
am 3f156d73: am 12ee56aa: am 5f27b486: am 53bbb4ff: Merge "docs: OpenGL Dev Guide, fix bug: 6104328" into jb-mr1.1-docs
...
* commit '3f156d7331a0932755cea431b5c681f451055fdf':
docs: OpenGL Dev Guide, fix bug: 6104328
2013-04-10 14:28:15 -07:00
Joe Fernandez
3f156d7331
am 12ee56aa: am 5f27b486: am 53bbb4ff: Merge "docs: OpenGL Dev Guide, fix bug: 6104328" into jb-mr1.1-docs
...
* commit '12ee56aaad5614e010edd24f41654b6ab135492c':
docs: OpenGL Dev Guide, fix bug: 6104328
2013-04-10 14:24:51 -07:00
Joe Fernandez
12ee56aaad
am 5f27b486: am 53bbb4ff: Merge "docs: OpenGL Dev Guide, fix bug: 6104328" into jb-mr1.1-docs
...
* commit '5f27b4860b67ac35b8089c244c89832689a8297a':
docs: OpenGL Dev Guide, fix bug: 6104328
2013-04-10 14:22:36 -07:00
Joe Fernandez
5f27b4860b
am 53bbb4ff: Merge "docs: OpenGL Dev Guide, fix bug: 6104328" into jb-mr1.1-docs
...
* commit '53bbb4ff4970c52619a78c54da6356f2b5aeb2a7':
docs: OpenGL Dev Guide, fix bug: 6104328
2013-04-10 14:20:31 -07:00
Joe Fernandez
53bbb4ff49
Merge "docs: OpenGL Dev Guide, fix bug: 6104328" into jb-mr1.1-docs
2013-04-10 21:17:21 +00:00
Dianne Hackborn
064fab54d7
Merge "Fix issue #7691456 : adbd CPU usage identified as Bluetooth in battery stats" into jb-mr2-dev
2013-04-10 21:15:15 +00:00
Michael Wright
f710413692
Merge "Stop marking gamepads as keyboards" into jb-mr2-dev
2013-04-10 21:14:27 +00:00
Romain Guy
5180ed141d
Merge "Instrument views inflation in systrace" into jb-mr2-dev
2013-04-10 21:07:09 +00:00
Dianne Hackborn
2323dd8d1e
Fix issue #7691456 : adbd CPU usage identified as Bluetooth in battery stats
...
Bluetooth GID was wrong and pointless and dumb and now gone.
Change-Id: Ibde563ef0c10c6d316428e1e683b013005b934d4
2013-04-10 12:50:12 -07:00
Baligh Uddin
0cb1990921
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-04-10 19:36:55 +00:00
Mathias Agopian
ab814a6472
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 12:33:15 -07:00
Maxim Siniavine
85478b5972
Skip apps without launch intent.
...
If an app from the apk cannot be launched then skip it in compatibility
test, rather than generate a null pointer exception.
Change-Id: I252031f249bfe25282b10394889ab8c5506cabcf
2013-04-10 12:14:11 -07:00
Maxim Siniavine
d9621f8670
Merge "Make download manager tests more reliable." into jb-mr2-dev
2013-04-10 18:47:29 +00:00
Romain Guy
09f7b93a18
Instrument views inflation in systrace
...
Change-Id: If3cd80bc430893c701432f165b4c1f5943a4143c
2013-04-10 11:42:44 -07:00
Scott Main
2e68794a3f
am 7104fda4: am 915ece10: am 33702b8f: am 09810499: am 26a5305f: add a little more information to hierarchy view intro
...
* commit '7104fda428133e9ddfd859644b7cc6bef7479c4d':
add a little more information to hierarchy view intro
2013-04-10 11:40:15 -07:00
Tim Murray
a8aa6880e4
Merge "Add GC thread to RSGL." into jb-mr2-dev
2013-04-10 18:37:35 +00:00
Scott Main
7104fda428
am 915ece10: am 33702b8f: am 09810499: am 26a5305f: add a little more information to hierarchy view intro
...
* commit '915ece10b42d6f45ce9b7317fe94f3e845403ee1':
add a little more information to hierarchy view intro
2013-04-10 11:36:30 -07:00
Scott Main
915ece10b4
am 33702b8f: am 09810499: am 26a5305f: add a little more information to hierarchy view intro
...
* commit '33702b8fd66b74fc291a96659327b3bdd4e81ba0':
add a little more information to hierarchy view intro
2013-04-10 11:31:37 -07:00
Adam Powell
72d574cbe0
Permit null adapters in Spinners
...
Bug 8538144
Change-Id: I83f0ae78ce15f46827fb721cd0df1972b7d9d198
2013-04-10 11:27:08 -07:00