Jeff Sharkey
7e92ef3a11
Volumes know parent disks; unsupported disks.
...
This is cleaner and more direct than the reverse of having the disk
publish child volume membership. Rename state constants to match
public API. Add state representing bad removal. Make it clear that
volume flags are related to mounting.
Send new unsupported disk event when we finish scanning an entire
disk and have no meaningful volumes.
Splice disk labels into description when known. Only adoptable
slots are directly visible to apps.
Bug: 19993667
Change-Id: I12fda95be0d82781f70c3d85c039749052dc936b
2015-04-17 17:35:11 -07:00
Svetoslav
6c589570c4
Remove unnecessary WRITE_SMS permission - framework
...
Currently only one app can write to the SMS provider and it has to
be set as the default SMS app by the user in the UI. The default
SMS app is set by enabling the write SMS app op for it and keeping
this op off for other SMS apps. Hence, this permission does not
guard anything and can be taken out. The API change is fine as if
an app refers to the permission in the manifest as string it will
be ignored and if it was referred in Java the value is statically
compiled in the source.
Change-Id: I1128c3b034e6c7dda4baa051500ac1ef46a53575
2015-04-18 00:18:53 +00:00
Sean Wan
9cf312db82
am 527b1d3a: (-s ours) am d1a72651: am b792f433: Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev
...
* commit '527b1d3a06a6665006406a4239a58035642bc418':
DO NOT MERGE: Make wifi scan interval when disconnected configurable.
2015-04-18 00:17:03 +00:00
Svetoslav
8c6bbad4a1
Merge "Teach telephony about location app ops"
2015-04-18 00:16:29 +00:00
Doris Liu
b1b0aa58bf
Merge "Revert "Use real screen size to scale duration""
2015-04-18 00:14:38 +00:00
Doris Liu
7513aab4df
Revert "Use real screen size to scale duration"
...
This reverts commit 5ed54c743c04e2bc349e12c31adb67cbc3094651.
Reverting to avoid build breakage.
Change-Id: Ib73056bb5a11e718cbc82db5917946bdf8db06dc
2015-04-18 00:14:14 +00:00
Sean Wan
527b1d3a06
am d1a72651: am b792f433: Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev
...
* commit 'd1a72651ed723b8e89875cdd7e0429f1c35ca8c2':
DO NOT MERGE: Make wifi scan interval when disconnected configurable.
2015-04-18 00:04:38 +00:00
Svetoslav
275b5635ad
Teach telephony about location app ops
...
Change-Id: I2bd8f0cb90d161994045d403f5d0c129ea951c3f
2015-04-18 00:03:45 +00:00
Sean Wan
d1a72651ed
am b792f433: Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev
...
* commit 'b792f43301c61cce996dd5bac4589b4720a37bec':
DO NOT MERGE: Make wifi scan interval when disconnected configurable.
2015-04-17 23:55:21 +00:00
Sean Wan
b792f43301
Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev
2015-04-17 23:45:37 +00:00
Doris Liu
14e317a33c
Merge "Use real screen size to scale duration"
2015-04-17 23:40:55 +00:00
Alan Viverette
044e9f992f
Merge "SeekBar track and progress should both be 2dp"
2015-04-17 23:40:42 +00:00
Doris Liu
5ed54c743c
Use real screen size to scale duration
...
Duration scale based on screen size was using the area of the screen
excluding system bars to compare with our reference device's screen
size. This caused the following issues:
1) On baseline device (i.e N5) a scaling factor that is not 1 will be
applied to the duration.
2) Scaling on the same device will be different in landscape vs.
portrait, as the system bars take different amounts of space in
different orienations.
This CL fixes both of the above issues.
Bug: 20309042
Change-Id: I9d1d0a471d968bee1330b80f0f69a0066d6a1860
2015-04-17 16:25:01 -07:00
Sean Wan
79858a3260
DO NOT MERGE: Make wifi scan interval when disconnected configurable.
...
Bug: 19335429
Change-Id: I167af190f0e448915f50d8edf853cf8a33646d44
2015-04-17 16:08:59 -07:00
Alan Viverette
0cb6eba539
SeekBar track and progress should both be 2dp
...
Bug: 20341931
Change-Id: Ica3b97d6fa1c96f2215afb0199e68dfe1976109b
2015-04-17 15:54:22 -07:00
Junda Liu
0ff9fd87d0
Add multi-sim support for getCarrierPackageNamesForIntent.
...
Bug: b/20268073
Change-Id: Id100b7c4606287a1daa90092cd3c8a5a6519247d
2015-04-17 15:51:46 -07:00
Svet Ganov
712aa62931
Merge "Fix build for real"
2015-04-17 22:50:41 +00:00
Svet Ganov
e8b6debd9b
Fix build for real
...
Change-Id: I5742226e9b873cd5a035f11be0e228188e215365
2015-04-17 15:49:53 -07:00
Jeff Brown
f9978f863f
Merge "Fix leaks due to GC circular references."
2015-04-17 22:27:03 +00:00
Jeff Brown
3b4049e79b
Fix leaks due to GC circular references.
...
The DisplayEventReceiver and SensorManager event queue both get
leaked when the Looper thread they are attached to dies because
the Java object holds a strong reference to its native peer and
meanwhile the native peer holds a strong reference to the Java
object through JNI.
Fixed the issue by indirecting through a weak reference as was
done for InputEventReceiver some time ago.
Bug: 12455729
Change-Id: I3d80a2a190192d1a2981bf5ae0cad30f0f7688a5
2015-04-17 15:24:31 -07:00
Svet Ganov
d156a7b45a
Merge "Fix build"
2015-04-17 22:17:42 +00:00
Alan Viverette
b75de201db
Merge "Restore windowMinWidthMajor/Minor in alert dialog overlay theme"
2015-04-17 22:16:08 +00:00
Svet Ganov
6762301a10
Fix build
...
Change-Id: If469dce767b492c3fcc1ad8cf7ab1041eb61096f
2015-04-17 15:14:54 -07:00
Alan Viverette
614b9563c8
Restore windowMinWidthMajor/Minor in alert dialog overlay theme
...
Bug: 20185630
Change-Id: Ic4a6b3d84a24c26846ea0fcc3ce32ca882e4dd95
2015-04-17 14:36:51 -07:00
Svet Ganov
d3c1ddb892
Merge "Add OP_READ_PHONE_STATE app op - framework"
2015-04-17 21:34:04 +00:00
Yorke Lee
f200406150
Merge "Set default values for VVM constants in CarrierConfigManager"
2015-04-17 21:26:21 +00:00
Yorke Lee
2850d7a599
Set default values for VVM constants in CarrierConfigManager
...
* Also hide the constants, they don't need to be @SystemApi
* Make VVM_PORT_NUMBER an Int
Bug: 20272209
Change-Id: I0d47afd7916d40f77ba5bf8e95306b46b27c15b3
2015-04-17 14:24:20 -07:00
John Reck
9d4efdf280
Revert "A bunch more cleanups"
...
This reverts commit c294d128d03bc9a9982b273a82516c04583438cc.
Change-Id: Id1ebb236950f7c36c6d86e1dd95566d3a200748d
2015-04-17 20:47:27 +00:00
John Reck
7809f835ca
Revert "Move AssetAtlas off of SkBitmap*"
...
This reverts commit 87ffb63d90fb6dd2689fe72dcb24fda9a6156220.
Change-Id: I92adfcee454a0a19020cdd9e96a134be0ee529aa
2015-04-17 20:46:47 +00:00
John Reck
afbeb2c237
Merge "Revert "Remove Bitmap#getSkBitmap""
2015-04-17 20:46:22 +00:00
John Reck
1ff961dd6d
Revert "Remove Bitmap#getSkBitmap"
...
This reverts commit 4bd981ec533a65e8dee053a0a709b484770b0a76.
Change-Id: I5c92cd955c6e70e197dc5cbc5dfeed8369a24a31
2015-04-17 20:45:15 +00:00
Svet Ganov
16a1689950
Add OP_READ_PHONE_STATE app op - framework
...
The READ_PHONE_STATE permission protects PII information and
is in the Phone group. This change is adding the corrseponding
app op for gating access to the API guarded by READ_POHNE state
which will be used instead as an access control for legacy apps.
Change-Id: I2ff895a5a0e529f26ec0ad706266a30d829268ba
2015-04-17 20:43:56 +00:00
Andy Hung
eaa388bc2c
Merge "Add non-blocking writes to AudioTrack"
2015-04-17 20:38:24 +00:00
Jorim Jaggi
601462f23d
Merge "Speedup unlock when authenticating with fingerprint"
2015-04-17 20:27:22 +00:00
Jorim Jaggi
f3b3bee129
Speedup unlock when authenticating with fingerprint
...
Change-Id: Ib76ff7a2a42cf6fc77848ef799c2a13b77cfebb2
2015-04-17 13:26:39 -07:00
Eino-Ville Talvala
7b4e887390
Merge changes from topics 'add-depth-capability', 'add-highresolution-level'
...
* changes:
Camera2: Add DEPTH_OUTPUT capability and DEPTH_DEPTH_IS_EXCLUSIVE field.
Camera: Add HIGH_RESOLUTION hardware level.
2015-04-17 20:22:43 +00:00
Andy Hung
e354f5d580
Merge "Add non-blocking reads to AudioRecord"
2015-04-17 19:51:36 +00:00
Dmitriy Ivanov
5e4b823aa0
am 34f0fd23: am a04b4302: am b0557ace: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
...
* commit '34f0fd239c456e4e064e4c14b768962292023800':
Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
2015-04-17 19:47:51 +00:00
Andres Morales
e0a31c8bab
Merge "Recover from dead GateKeeperService Binder"
2015-04-17 19:43:00 +00:00
Dmitriy Ivanov
34f0fd239c
am a04b4302: am b0557ace: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
...
* commit 'a04b43020e1289e8b7b2501471740ace944f18d5':
Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
2015-04-17 19:30:56 +00:00
Dmitriy Ivanov
a04b43020e
am b0557ace: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
...
* commit 'b0557acebc7a47f6d8a3653c376165160fc68105':
Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
2015-04-17 19:20:22 +00:00
Dmitriy Ivanov
b0557acebc
Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
2015-04-17 19:01:42 +00:00
Dan Albert
1dfab471ed
am a26c8371: am 5682a23e: am fef8bcf9: Merge "Explicitly use clang."
...
* commit 'a26c83718004c7640827d86b0f6a0fdf33017751':
Explicitly use clang.
2015-04-17 18:50:41 +00:00
Dmitriy Ivanov
811b7266fd
Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
...
It is no longer needed.
Change-Id: I1b5a58528507df35cc0792a18be5583e3605cbe0
2015-04-17 11:50:29 -07:00
Dan Albert
a26c837180
am 5682a23e: am fef8bcf9: Merge "Explicitly use clang."
...
* commit '5682a23ed41f50057887870f1aa9848b13a26190':
Explicitly use clang.
2015-04-17 18:42:44 +00:00
Alan Viverette
65aea84c5a
Merge "Move date picker arrows out of SimpleMonthView"
2015-04-17 18:16:19 +00:00
Mady Mellor
62b5b02c4f
Merge "Drag n drop for stylus"
2015-04-17 18:14:50 +00:00
Dan Albert
5682a23ed4
am fef8bcf9: Merge "Explicitly use clang."
...
* commit 'fef8bcf92167fbfe06cfb4a18ddf12f272cae5f0':
Explicitly use clang.
2015-04-17 18:06:54 +00:00
Selim Cinek
ccc9b7f85c
Merge "Fixed a crash on android tv with the new heads-up manager"
2015-04-17 18:03:29 +00:00
Selim Cinek
29fa89b41e
Fixed a crash on android tv with the new heads-up manager
...
Bug: 20282768
Change-Id: Ibb3dc879a2529c12f4d8ab6b031711363da93d37
2015-04-17 11:02:33 -07:00