OSDN Git Service
Steve Pomeroy [Thu, 14 Mar 2013 04:42:10 +0000 (00:42 -0400)]
Fix documentation bug in SQLiteDatabase
The documentation incorrectly states that, "[insertWithOnConflict
returns] the primary key of the existing row if the input param
'conflictAlgorithm' = CONFLICT_IGNORE". Unfortunately, SQLite does
not provide such functionality.
Close: https://code.google.com/p/android/issues/detail?id=13045
Change-Id: Ife919c4dcf7bf703b692d338d1fb5844a532dd39
Signed-off-by: Steve Pomeroy <steve@staticfree.info>
Chad Brubaker [Thu, 12 May 2016 19:18:47 +0000 (19:18 +0000)]
Merge "Support TrustedCertificateStore.findAllIssuers"
Chad Brubaker [Fri, 18 Dec 2015 21:43:28 +0000 (13:43 -0800)]
Support TrustedCertificateStore.findAllIssuers
(cherry-picked from commit
aa6c3c3e252252b80c3900bd4c1ff27d37265c6d)
Change-Id: I176ec42c9907e50ee218e4fb352b530ca797be46
Miao Wang [Wed, 11 May 2016 19:13:00 +0000 (19:13 +0000)]
Merge "[RenderScript] Interrupt mMessageThread when tearing down context."
Joachim Sauer [Wed, 11 May 2016 13:47:08 +0000 (13:47 +0000)]
Merge "Fix AbstractStringBuilder gaining extra APIs."
Joachim Sauer [Tue, 10 May 2016 14:09:08 +0000 (15:09 +0100)]
Fix AbstractStringBuilder gaining extra APIs.
AbstractStringBuilder showed up in the API as gaining methods originally
belonging to StringBuffer/StringBuilder (mostly append(*) and
insert(*)).
Ideally it should not be in the API at all, but it's traditionally been
there and we'll keep it for now.
@hide the affected methods and move the "implements Appendable"
definition to StringBuffer/StringBuilder (as methods implementing an
interface can't be @hidden).
(cherry picked from commit
91f4aec3ccb4b2a2b66fbde095baa584b0862c11)
Bug:
27582395
Change-Id: I0b85c2c84f3e52ffe7864728d083f9c6ea7304ef
Miao Wang [Tue, 10 May 2016 23:44:11 +0000 (16:44 -0700)]
[RenderScript] Interrupt mMessageThread when tearing down context.
- Interrupt mMessageThread, so it gets to see immediately
that mRun is false and exit rightaway.
Change-Id: Ic586ef225a5c6f3a77f89de00b7fb3f3547c9838
Hans Boehm [Tue, 10 May 2016 23:41:30 +0000 (23:41 +0000)]
Merge "Clear more native pointers in finalizers"
Hans Boehm [Tue, 10 May 2016 20:01:22 +0000 (13:01 -0700)]
Clear more native pointers in finalizers
This hopefully handles the remaining finalizers in frameworks/base
that didn't guard against calls from other finalizers after being
finalized.
The goal here is to reduce the possible corruption causes we have
to think about by a few.
If any of theses are either very frequently used, or use large
Java (as opposed to native) objects, we should probably convert them
to NativeAllocationRegistry instead. But that's more work.
Bug:
18178237
Change-Id: I79bc0e8fa20af8f340418a6226022e0294d77f02
Yi Kong [Mon, 9 May 2016 16:40:38 +0000 (16:40 +0000)]
Yi Kong [Thu, 5 May 2016 10:32:54 +0000 (11:32 +0100)]
Track libcore change
e2f147b9b14c7645f29e92758f811a18258feef4
Bug:
28582540
Change-Id: Ic944995957aa1a5ec65ecab2a8d4b8587094ccc8
Calin Juravle [Mon, 9 May 2016 15:43:41 +0000 (15:43 +0000)]
Merge "Read -Xjittransitionweight from system properties."
Treehugger Robot [Fri, 6 May 2016 23:20:01 +0000 (23:20 +0000)]
Merge "Fix divergent equals and hashCode behavior"
Ajay Panicker [Fri, 6 May 2016 23:18:51 +0000 (23:18 +0000)]
Merge "List the CONNECTION_STATE_CHANGED broadcast for MAP as protected"
Ajay Panicker [Fri, 6 May 2016 23:18:32 +0000 (23:18 +0000)]
Merge "Protect TRANSFER_COMPLETE broadcast"
Pavlin Radoslavov [Fri, 6 May 2016 19:05:47 +0000 (12:05 -0700)]
Fix divergent equals and hashCode behavior
Calling Objects.hash with a byte[] will call the identity hashCode on
the byte[] and this doesn't agree with the use of Objects.deepEquals
in equals.
Bug caught by error prone.
Also, replaced usage of Objects.deepEquals(mServiceDataUuid, ...) with
Objects.equals(mServiceDataUuid, ...), because mServiceDataUuid
is an Object of type ParcelUuid.
Bug:
28585195
Change-Id: Id92734874339985fedafe1a28286a6a4dcd88d3b
Hans Boehm [Fri, 6 May 2016 17:25:47 +0000 (17:25 +0000)]
Merge "Improve grammar in startService() documentation."
Ajay Panicker [Fri, 6 May 2016 01:59:44 +0000 (18:59 -0700)]
Protect TRANSFER_COMPLETE broadcast
Bug:
28621801
Change-Id: Ia90abd00694ae80000f59ee0a17826592fd2159b
Hans Boehm [Thu, 5 May 2016 20:09:28 +0000 (13:09 -0700)]
Improve grammar in startService() documentation.
Change-Id: If72f710caa2e85512636d6f7ddacff2426cfb835
Amith Yamasani [Thu, 5 May 2016 17:45:53 +0000 (17:45 +0000)]
Merge "Fix the issue that App crash on startForeground."
Neil Fuller [Thu, 5 May 2016 15:06:47 +0000 (15:06 +0000)]
Merge changes from topic 'icu_cp_catchup'
* changes:
Track external/icu API changes for factory registration
ICU4J: Hide constants that can change between releases
Remove RawCollationKey/ByteArrayWrapper from the public API
Wang Le [Wed, 4 May 2016 11:24:35 +0000 (19:24 +0800)]
Fix the issue that App crash on startForeground.
Install single APP in any user space except Owner user, the APP
got crash when call startForeground in Service Component with
Notification which without SmallIcon.
bug:https://code.google.com/p/android/issues/detail?id=209043
Change-Id: I88a3b8afc213cafe0f280f9b44d6acd2ea0df207
Signed-off-by: Wang Le <wangle@xiaomi.com>
Neil Fuller [Wed, 4 May 2016 17:46:45 +0000 (18:46 +0100)]
Track external/icu API changes for factory registration
Bug:
28583844
(cherry picked from commit
e7fda97fff236afa5597da7df69b1462390c5a14)
Change-Id: I4a411184fe002ea812349e49d07d17c62c66d842
Paul Duffin [Thu, 31 Mar 2016 12:15:03 +0000 (13:15 +0100)]
ICU4J: Hide constants that can change between releases
Bug:
27830659
(cherry picked from commit
71498f107ce41a1c3f2bc612fa214579aab19db1)
Change-Id: I007ed563d78cdf36ddd0e36ae72f118189772e5c
Paul Duffin [Tue, 22 Mar 2016 16:53:41 +0000 (16:53 +0000)]
Remove RawCollationKey/ByteArrayWrapper from the public API
Bug:
22023363
(cherry picked from commit
baa72515f60af798ea9a03e53a78a7d95834ceff)
Change-Id: If81d9a67ba9edf15688f4369390a6734d92a8f3c
Vikas Marwaha [Tue, 3 May 2016 20:50:39 +0000 (20:50 +0000)]
Merge "Fix issue #
25727069: Top sleeping activity overrides foreground service"
Ajay Panicker [Tue, 3 May 2016 18:14:07 +0000 (11:14 -0700)]
List the CONNECTION_STATE_CHANGED broadcast for MAP as protected
Bug:
28527879
Change-Id: Ifb2db87677e92022814bb9704c26009d249ac6ce
Ajay Panicker [Tue, 3 May 2016 17:22:57 +0000 (17:22 +0000)]
Merge "List the SDP_RECORD broadcast as protected"
Ajay Panicker [Tue, 19 Apr 2016 17:16:54 +0000 (10:16 -0700)]
List the SDP_RECORD broadcast as protected
Bug:
28257589
Change-Id: I97ef91fa3a7f7ef62fd96ca079e0a6d5a957bc71
Dianne Hackborn [Tue, 17 Nov 2015 19:14:43 +0000 (11:14 -0800)]
Fix issue #
25727069: Top sleeping activity overrides foreground service
Change-Id: I9a085cd650604f9d6277ad343bf3c3852324cafc
Treehugger Robot [Fri, 29 Apr 2016 09:36:05 +0000 (09:36 +0000)]
Merge "FloatingToolbar: Fix javadoc for closeOverflow()."
Adam Lesinski [Thu, 28 Apr 2016 20:06:19 +0000 (20:06 +0000)]
Merge "AAPT: ProGuard config for components in main dex."
Chih-hung Hsieh [Thu, 28 Apr 2016 18:47:00 +0000 (18:47 +0000)]
Merge "Fix google-explicit-constructor warnings."
Sebastian Kaspari [Tue, 9 Feb 2016 15:22:08 +0000 (16:22 +0100)]
FloatingToolbar: Fix javadoc for closeOverflow().
Change-Id: I450fc603ae5fe49f08f580594352cc1120cc104d
Calin Juravle [Wed, 27 Apr 2016 13:12:00 +0000 (14:12 +0100)]
Read -Xjittransitionweight from system properties.
Bug:
27865109
(cherry picked from commit
8d74de55464c885b602b34252ee8721a9e810dcf)
Change-Id: Id4f0668ea212f0fd82d32437ea251118bfce1ae2
Narayan Kamath [Thu, 28 Apr 2016 12:13:37 +0000 (12:13 +0000)]
Merge "ZipUtils: Fix wrong timestamps when getEntryInfo"
Shammi Khattar [Wed, 6 Apr 2016 22:33:03 +0000 (15:33 -0700)]
ZipUtils: Fix wrong timestamps when getEntryInfo
"tm_mon" format should align with "ZipEntry::setModWhen" in aapt.
"tm_isdst" should be initialized, or it will because random value
and cause error in function mktime().
BUG:
28021145
Change-Id: I1e8d5c14e5d7b875bf9cd940cb7f4c5b93a1bcd6
Chih-Hung Hsieh [Wed, 27 Apr 2016 18:29:23 +0000 (11:29 -0700)]
Fix google-explicit-constructor warnings.
Bug:
28341362
Change-Id: Ibdd6a210bb7ff228e3624cc319169f77aca3b51e
Rohit Agrawal [Thu, 21 Apr 2016 23:29:58 +0000 (16:29 -0700)]
AAPT: ProGuard config for components in main dex.
Create an analogue of "aapt -G" which outputs a proguard configuration
that keeps only components which need to be in the main dex.
BUG:
27383099
Change-Id: Ic18c8c563794ff27a5598a214111d1b446a005f1
(cherry picked from commit
86229cb622fccde8ab8cbe85eead91a34313a708)
Dimitry Ivanov [Wed, 27 Apr 2016 18:24:33 +0000 (18:24 +0000)]
Merge "zygote: Remove NativeLoader initialization step"
Dimitry Ivanov [Wed, 27 Apr 2016 18:24:04 +0000 (18:24 +0000)]
Merge changes from topic 'target-sdk-0-fix'
* changes:
Create linker namespace for the system server classloader
Extract pathclassloader initialization to a separate class
Dimitry Ivanov [Thu, 21 Apr 2016 23:18:24 +0000 (16:18 -0700)]
zygote: Remove NativeLoader initialization step
This now done by art Runtime::Start()
Bug: http://b/
28320913
Change-Id: Icf9b11954b732c9f953e02bba9ae52eb91117457
Dimitry Ivanov [Wed, 20 Apr 2016 23:02:00 +0000 (16:02 -0700)]
Create linker namespace for the system server classloader
Bug: http://b/
27702070
Change-Id: I12c9448e877202937cf558de75042bcb46f6a933
Paul Duffin [Wed, 27 Apr 2016 13:26:38 +0000 (13:26 +0000)]
Merge changes from topic 'icu-cherry-pick-from-nyc-to-aosp'
* changes:
Hide general utility methods in ICU4J.
ICU4J: Removed a couple of useless or internal methods from API
ICU4J: Update API for using civil version of IslamicCalendar
Shubham Ajmera [Wed, 27 Apr 2016 09:45:03 +0000 (09:45 +0000)]
Dimitry Ivanov [Wed, 20 Apr 2016 21:09:32 +0000 (14:09 -0700)]
Extract pathclassloader initialization to a separate class
To be able to reuse this code when creating a classloader for
the system_server.
Bug: http://b/
27245894
Bug: http://b/
27702070
Change-Id: I928175a39a1beb0446d863a5b8f5edf94686e768
Treehugger Robot [Tue, 26 Apr 2016 18:32:50 +0000 (18:32 +0000)]
Merge "Alarm icon is not shown for secondary users"
Shubham Ajmera [Tue, 26 Apr 2016 16:48:26 +0000 (17:48 +0100)]
Track libcore change
13331bc0dd87b029b194e5aca4487e38d18da188
Bug:
27214236
Change-Id: I3074436baaa16fe19a158aa3aafdb79b534f792b
Calin Juravle [Mon, 25 Apr 2016 11:09:00 +0000 (11:09 +0000)]
Merge "Handle dalvik.vm.usejitprofiles property"
Neil Fuller [Mon, 25 Apr 2016 09:31:40 +0000 (09:31 +0000)]
Tobias Thierer [Mon, 25 Apr 2016 09:08:43 +0000 (09:08 +0000)]
Merge "Avoid instantiations of Boolean that are immediately unboxed."
Shubham Ajmera [Wed, 20 Apr 2016 15:06:55 +0000 (16:06 +0100)]
Track libcore change
e2270147c6ddfb164776b68295078a5e6c6dfee7
Bug:
27426743
(cherry picked from commit
6c69351469b9da7b424e9726c0bf878115a389b2)
Change-Id: I7276e39951d721704726132281c316c77bdab515
Calin Juravle [Fri, 22 Apr 2016 15:40:50 +0000 (16:40 +0100)]
Handle dalvik.vm.usejitprofiles property
Bug:
26080105
Partial cherry picked from commit
db4a79a5d7d348e9d2286d95d4e5a59dd484456f
Change-Id: Ifef4ec0d153b8d30941a339d7f9052889631f84c
Tobias Thierer [Fri, 22 Apr 2016 14:43:52 +0000 (14:43 +0000)]
Merge "Fix needless value boxing/unboxing in Am.java (except the Long unboxing covered by a separate CL)."
Joachim Sauer [Tue, 22 Mar 2016 13:32:35 +0000 (13:32 +0000)]
Hide general utility methods in ICU4J.
Bug:
22023363
(cherry picked from commit
d76fe896d444ee7bf625493e12c51ee28bcc82ef)
Change-Id: Ic923c558270b81fe48034c46bfcd9b1ac1d438f2
Paul Duffin [Sat, 19 Mar 2016 16:32:45 +0000 (16:32 +0000)]
ICU4J: Removed a couple of useless or internal methods from API
Bug:
22023363
(cherry picked from commit
c108dea0bb0558f6d8462374775891005469097d)
Change-Id: I07c42b1124490daf502d1b3aff37b249d6118552
Paul Duffin [Tue, 22 Mar 2016 13:46:38 +0000 (13:46 +0000)]
ICU4J: Update API for using civil version of IslamicCalendar
Bug:
22023363
(cherry picked from commit
74a8e08d59169865ecb5e0ae9ba6a57f0814a05a)
Change-Id: I0d7b756be123f806d035ee225960f27806785424
Tobias Thierer [Thu, 21 Apr 2016 16:51:41 +0000 (17:51 +0100)]
Avoid instantiations of Boolean that are immediately unboxed.
Replaced Boolean.valueOf() -> parseBoolean() across frameworks/base
(not including Am.java, which I'm leaving for a separate change).
Also fixed a couple of other valueOf()s in SyncStorageEngine.
Bug:
28289401
Change-Id: I2c6fb39a465885e7e625ed8894b1b9f8a30da5bc
Tobias Thierer [Fri, 22 Apr 2016 10:27:26 +0000 (10:27 +0000)]
Merge "frameworks/base: Avoid Long object allocations in Long.valueOf()"
Tobias Thierer [Thu, 21 Apr 2016 17:51:17 +0000 (18:51 +0100)]
Fix needless value boxing/unboxing in Am.java
(except the Long unboxing covered by a separate CL).
Tested: Successfully built frameworks/base
Bug:
28289401
Change-Id: I40d09af9c003b7667cb96171747bd355d7a9dc4f
Tobias Thierer [Thu, 21 Apr 2016 13:52:10 +0000 (14:52 +0100)]
frameworks/base: Avoid Long object allocations in Long.valueOf()
Replace usages where the Long is immediately unboxed or thrown
away with Long.parseLong().
In TaskRecord.java, I also fixed up similar uses of
{Boolean,Integer}.valueOf()
Tested: built frameworks/base successfully.
Bug:
28289401
Change-Id: I1fad536853a68c7b0707cbf02989aca155064843
Tobias Thierer [Thu, 21 Apr 2016 13:23:18 +0000 (13:23 +0000)]
Merge "Integer.valueOf() -> Integer.parseInt() to avoid allocation."
Tobias Thierer [Thu, 21 Apr 2016 11:02:10 +0000 (12:02 +0100)]
Integer.valueOf() -> Integer.parseInt() to avoid allocation.
Bug:
28289401
Change-Id: If767f891644a06ba587f9bb55dccea4089a8c66d
Adam Lesinski [Wed, 20 Apr 2016 22:37:18 +0000 (22:37 +0000)]
Merge "Doze settings example not matching real keys"
Yang Ni [Wed, 20 Apr 2016 18:14:08 +0000 (18:14 +0000)]
Merge "Made Element accessors thread-safe"
Yang Ni [Mon, 18 Apr 2016 23:56:16 +0000 (16:56 -0700)]
Made Element accessors thread-safe
Bug:
28177082
Change-Id: I8f3f2d8ce559e93cba29f8eedd5b95d1389deb23
(cherry picked from commit
33703f0c4e9b16bda5fd72e71d7d89359ee0db17)
Yi Kong [Wed, 20 Apr 2016 15:36:53 +0000 (15:36 +0000)]
Yi Kong [Wed, 20 Apr 2016 14:15:52 +0000 (15:15 +0100)]
Track libcore change
be1608980825868eb1c70fab6eb86fe06bd304ce
Bug:
27704598
Change-Id: I5cb900c7b48bc7b48ed0ea1110ff834e1d316de7
Yang Ni [Tue, 19 Apr 2016 18:02:01 +0000 (18:02 +0000)]
Merge "Fixed ScriptGroup finalizer for old API"
Yang Ni [Mon, 18 Apr 2016 21:27:02 +0000 (14:27 -0700)]
Fixed ScriptGroup finalizer for old API
Bug:
28242626
ScriptGroup finalizer clears out the list of closures, which is
uninitialized for the old API.
Need to check null first, before accessing the list.
Change-Id: Ibf914e17a0878c8c561f823c5f6f6f6619594de1
(cherry picked from commit
07837d6dab331b1693aa3689223b4012012a7fad)
Henrik Baard [Tue, 19 Apr 2016 05:50:24 +0000 (07:50 +0200)]
Doze settings example not matching real keys
The keys used in the example for the Doze timeouts does
not match any real key. To avoid confusion the example
should match the existing keys.
Change-Id: I0306c542dac9e38aea7d172a3e0f7472d327c73c
Robert Greenwalt [Mon, 18 Apr 2016 21:58:05 +0000 (21:58 +0000)]
Merge "Fix issues of different phone objects sharing same mConnectionApns list."
Yi Kong [Mon, 18 Apr 2016 09:57:23 +0000 (09:57 +0000)]
Lorenzo Colitti [Mon, 18 Apr 2016 06:54:00 +0000 (06:54 +0000)]
Merge "When the applicantion is removed, reset network permission of this uid."
Andreas Gampe [Sat, 16 Apr 2016 00:40:00 +0000 (00:40 +0000)]
Merge "Frameworks/base: Fix old code in MediaPlayer"
Yi Kong [Tue, 12 Apr 2016 16:17:57 +0000 (17:17 +0100)]
Track libcore change
5458546631c65f6d375b6a1780d36d0abb5b95af
Bug:
28108421
Change-Id: Id0253fed98790f4c8eeb27877e14cf53474f29f0
Christopher Wiley [Thu, 14 Apr 2016 18:19:16 +0000 (18:19 +0000)]
Merge "libfilterfw_jni needs libmedia include paths"
Treehugger Robot [Thu, 14 Apr 2016 18:03:25 +0000 (18:03 +0000)]
Merge "libstorage needs libbinder include paths"
Christopher Wiley [Thu, 14 Apr 2016 17:21:03 +0000 (10:21 -0700)]
libfilterfw_jni needs libmedia include paths
This library includes libmedia headers, and needs its full include path.
Bug:
27804373
Test: This code compiles with a slightly modified libmedia include
path.
Change-Id: Ic9253c0f0e7236435f36f2baf47411ca7db187cd
Christopher Wiley [Thu, 14 Apr 2016 17:16:33 +0000 (10:16 -0700)]
libstorage needs libbinder include paths
This library is almost all binder related. It should be
using libbinder's published include path.
Bug:
27804373
Test: This library compiles with a slightly modified libbinder include
path.
Change-Id: Ib8e00b59604cdda69ec36cf1c90150b4b9033879
Shubham Ajmera [Thu, 14 Apr 2016 15:39:04 +0000 (15:39 +0000)]
Martijn Coenen [Thu, 14 Apr 2016 09:52:10 +0000 (09:52 +0000)]
Merge "Change storage duration to static for native choreographer."
Michael Wright [Wed, 27 Jan 2016 00:03:25 +0000 (16:03 -0800)]
Change storage duration to static for native choreographer.
This ensures that the region is zero initialized, regardless of compiler.
Change-Id: Ie0bfa5d2cd2486ba31a45aee4de6c370513bfc62
Martijn Coenen [Thu, 14 Apr 2016 08:11:45 +0000 (08:11 +0000)]
Merge "Add choreographer API to the NDK."
Shubham Ajmera [Wed, 13 Apr 2016 16:59:36 +0000 (17:59 +0100)]
Track libcore change
135ea6cd4f7ebe2f225351a1928d8a62bce5cb00
Bug:
27426743
(cherry-picked from commit
a871ab16871b0bb50790e97c3e1258ee3b0d33d6)
Change-Id: I4c77de05c99b811f60f2421d1f41e62c1404a4a4
Treehugger Robot [Wed, 13 Apr 2016 14:25:04 +0000 (14:25 +0000)]
Merge "Fix: the label "customize" is not updated after changing language"
Treehugger Robot [Wed, 13 Apr 2016 13:32:38 +0000 (13:32 +0000)]
Merge "Dismiss keyguard when user button is tapped"
Calin Juravle [Wed, 13 Apr 2016 11:44:56 +0000 (11:44 +0000)]
Merge "Handle dalvik.vm.jitprithreadweight property"
Shinichiro Hamaji [Wed, 13 Apr 2016 02:29:14 +0000 (02:29 +0000)]
Merge "Let WAPPushManager depend on its proguard.flags"
Yang Ni [Tue, 12 Apr 2016 22:07:56 +0000 (22:07 +0000)]
Merge "Destroy Type created by Allocation.createSized()"
Calin Juravle [Tue, 12 Apr 2016 13:12:04 +0000 (14:12 +0100)]
Handle dalvik.vm.jitprithreadweight property
Bug:
28065407
Bug:
27865109
Change-Id: I8cebc22a9e072fd1d6d765427a0cd59ba2201bf6
Yang Ni [Tue, 12 Apr 2016 16:00:46 +0000 (16:00 +0000)]
Merge "Destroy Closures in ScriptGroup"
Yi Kong [Tue, 12 Apr 2016 14:44:30 +0000 (14:44 +0000)]
Yi Kong [Tue, 12 Apr 2016 13:05:59 +0000 (14:05 +0100)]
Track libcore change
2115cc0ca7d60965a361129d8826478ff2d847e4
Bug:
28108421
Change-Id: I774f264bf538b0fa2aac63c8e5225f82d7b03c2e
Yang Ni [Thu, 7 Apr 2016 18:17:59 +0000 (11:17 -0700)]
Destroy Type created by Allocation.createSized()
Bug:
27972184
Change-Id: I4f80c74079087eab20b75a701c56cde141322462
Stephen Hines [Mon, 11 Apr 2016 21:48:34 +0000 (21:48 +0000)]
Merge "Fix typos for the word "Unsupported"."
Stephen Hines [Mon, 11 Apr 2016 20:05:55 +0000 (13:05 -0700)]
Fix typos for the word "Unsupported".
Bug: https://code.google.com/p/android/issues/detail?id=206490
Change-Id: Ie1b2c2b0960d8dd8c12ed06d84a16913cd057221
Julia Reynolds [Mon, 11 Apr 2016 14:33:03 +0000 (14:33 +0000)]
Merge "Show volume safety warning for all users"
qinglian.x.zhang [Thu, 14 Jan 2016 05:18:37 +0000 (13:18 +0800)]
Show volume safety warning for all users
The volume safety warning is shown only for owner.
It should be shown for all users.
Change-Id: I616038e3eecf8523aa5edd48843b0eb444607d2f
Kaori Katou [Tue, 26 May 2015 07:25:04 +0000 (16:25 +0900)]
Dismiss keyguard when user button is tapped
When multi-user is disabled and user button is tapped
on the keyguard, the contact app is displayed behind the keyguard.
The keyguard should be dismissed when the contact app is launched.
Change-Id: I7daa0bec84b5172e78668cc71e51955f166ede0a