OSDN Git Service
Kenny Guy [Wed, 2 Apr 2014 12:29:20 +0000 (13:29 +0100)]
Rename related users to profiles.
Rename the related user concept as profiles.
When returning profiles of a user include the
user as a profile of itself.
Change-Id: Id5d4f29017b7ca6844632ce643f10331ad733e1d
Alan Viverette [Mon, 31 Mar 2014 22:38:13 +0000 (22:38 +0000)]
Merge "Switch device default theme over to Quantum"
Baligh Uddin [Mon, 31 Mar 2014 22:11:26 +0000 (22:11 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 31 Mar 2014 22:09:53 +0000 (22:09 +0000)]
Merge "Import translations. DO NOT MERGE"
Alan Viverette [Mon, 31 Mar 2014 22:01:00 +0000 (15:01 -0700)]
Switch device default theme over to Quantum
Change-Id: I4d8ad0a9d62b898ae34900b4a749e75a975af5af
Zhihai Xu [Mon, 31 Mar 2014 21:35:38 +0000 (21:35 +0000)]
am
7d394df2: am
ae1b763c: Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev
* commit '
7d394df2ab8f951215a775df8d2bd9e6518e746a':
LE: Add API to configure MTU for a given connection (3/4)
Zhihai Xu [Mon, 31 Mar 2014 21:28:47 +0000 (21:28 +0000)]
am
ae1b763c: Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev
* commit '
ae1b763cded7e2cb3eec3cbec0680c25e55c109c':
LE: Add API to configure MTU for a given connection (3/4)
Zhihai Xu [Mon, 31 Mar 2014 21:21:54 +0000 (21:21 +0000)]
Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev
Nick Kralevich [Mon, 31 Mar 2014 20:26:27 +0000 (20:26 +0000)]
am
ce30fca8: am
e531e2ec: am
3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs."
* commit '
ce30fca85deec8e268009a2acaefe85541ab1e58':
Change when the SELinux relabel of /data/data occurs.
Nick Kralevich [Mon, 31 Mar 2014 20:20:41 +0000 (20:20 +0000)]
am
e531e2ec: am
3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs."
* commit '
e531e2ec6b311c35b077cc228e832b3f1530dffa':
Change when the SELinux relabel of /data/data occurs.
Nick Kralevich [Mon, 31 Mar 2014 20:14:37 +0000 (20:14 +0000)]
am
3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs."
* commit '
3b2a9d22794cb9f1c2a28884b5c3ba92ecc6ff96':
Change when the SELinux relabel of /data/data occurs.
Nick Kralevich [Mon, 31 Mar 2014 20:09:31 +0000 (20:09 +0000)]
Merge "Change when the SELinux relabel of /data/data occurs."
ztenghui [Mon, 31 Mar 2014 20:08:12 +0000 (20:08 +0000)]
Merge "Make the reveal animation API public"
Brian Carlstrom [Mon, 31 Mar 2014 20:06:06 +0000 (20:06 +0000)]
am
7156b7c6: am
b11952d6: am
e3434fc4: Merge "Improve detail message for X509TrustManagerExtensions argument validation"
* commit '
7156b7c65d6f158c4898a93f8e2cea0bf94791d1':
Improve detail message for X509TrustManagerExtensions argument validation
Brian Carlstrom [Mon, 31 Mar 2014 19:59:31 +0000 (19:59 +0000)]
am
b11952d6: am
e3434fc4: Merge "Improve detail message for X509TrustManagerExtensions argument validation"
* commit '
b11952d6f6851dbd1da447da967f6e07984942fe':
Improve detail message for X509TrustManagerExtensions argument validation
Brian Carlstrom [Mon, 31 Mar 2014 19:55:16 +0000 (19:55 +0000)]
am
e3434fc4: Merge "Improve detail message for X509TrustManagerExtensions argument validation"
* commit '
e3434fc4fb164b66e529e675dfc31652a4c69cb5':
Improve detail message for X509TrustManagerExtensions argument validation
Craig Stout [Mon, 31 Mar 2014 19:50:01 +0000 (19:50 +0000)]
am
fe710551: (-s ours) am
ecaea7e6: Merge "Force refresh of stateful when a child drawable is changed." into klp-modular-dev
* commit '
fe710551cfd98ce90f331e3b9a240d46f303f7b1':
Force refresh of stateful when a child drawable is changed.
Brian Carlstrom [Mon, 31 Mar 2014 19:49:34 +0000 (19:49 +0000)]
Merge "Improve detail message for X509TrustManagerExtensions argument validation"
Glenn Kasten [Mon, 31 Mar 2014 19:28:47 +0000 (19:28 +0000)]
Merge "Fix build from multiple declaration"
Adrian Roos [Thu, 27 Mar 2014 13:58:41 +0000 (14:58 +0100)]
Add a SampleTrustAgent
Adds a simple app that shows how to build a trust agent. For
lack of a better place to put this, this stays in Keyguard's tests
for now.
Bug:
13723878
Change-Id: I9ebad253d3d89c846fe8afaad6babce9e7b80b5e
Glenn Kasten [Mon, 31 Mar 2014 19:26:22 +0000 (12:26 -0700)]
Fix build from multiple declaration
Change-Id: Id2dd703aedef0423605407ab7a14ef7b48c2fcdb
Adrian Roos [Thu, 27 Mar 2014 13:58:03 +0000 (14:58 +0100)]
Make Keyguard trust aware
Bug:
13723878
Change-Id: If1f54de4112a120848df72192b82e35b341e8ed3
Adrian Roos [Mon, 31 Mar 2014 19:21:05 +0000 (19:21 +0000)]
Merge "Define trust agent framework components"
Adrian Roos [Thu, 27 Mar 2014 13:56:59 +0000 (14:56 +0100)]
Define trust agent framework components
Adds the TrustManager system service that allows
registering for changes to the trust status and
reporting events that are important to trust agents.
Bug:
13723878
Change-Id: I7d0d2ea86fd755702d31aa5d49cac038a6cd4301
Alan Viverette [Mon, 31 Mar 2014 19:13:17 +0000 (19:13 +0000)]
Merge "Clean up LayerDrawable, ensure cached values are cleared on changes"
Alan Viverette [Mon, 31 Mar 2014 19:12:45 +0000 (19:12 +0000)]
Merge "Remove unthemed drawable cache, since canApplyTheme != isThemed"
Adrian Roos [Mon, 31 Mar 2014 19:11:36 +0000 (19:11 +0000)]
Merge "Define initial trust agent API"
John Reck [Mon, 31 Mar 2014 19:09:12 +0000 (19:09 +0000)]
Merge "Turn on RenderThread"
Craig Stout [Mon, 31 Mar 2014 19:08:24 +0000 (19:08 +0000)]
am
ecaea7e6: Merge "Force refresh of stateful when a child drawable is changed." into klp-modular-dev
* commit '
ecaea7e60c0992ac295163f55c1f986a46eef008':
Force refresh of stateful when a child drawable is changed.
Alan Viverette [Mon, 31 Mar 2014 19:07:58 +0000 (12:07 -0700)]
Clean up LayerDrawable, ensure cached values are cleared on changes
Change-Id: I9a652475b6ad66379b1298bf53cd5dcb1a1dd37b
Baligh Uddin [Mon, 31 Mar 2014 19:05:36 +0000 (12:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I81bf08f36ce519a1cc397fc3cbb1d92878df54f1
Auto-generated-cl: translation import
Glenn Kasten [Mon, 31 Mar 2014 19:03:32 +0000 (19:03 +0000)]
Merge "Use set() return value instead of separate call to initCheck()"
Craig Stout [Mon, 31 Mar 2014 19:02:25 +0000 (19:02 +0000)]
Merge "Force refresh of stateful when a child drawable is changed." into klp-modular-dev
Chris Wren [Mon, 31 Mar 2014 18:53:34 +0000 (18:53 +0000)]
Merge "add a null check around scrollAdapter access"
Chris Wren [Mon, 31 Mar 2014 17:36:25 +0000 (13:36 -0400)]
add a null check around scrollAdapter access
Bug:
13727213
Change-Id: Ia92c06b66fc4712a758bf813c30f543b08546a80
Adrian Roos [Fri, 28 Mar 2014 12:02:19 +0000 (13:02 +0100)]
Define initial trust agent API
Adds the minimal API needed to define a useful trust agent.
Bug:
13723878
Change-Id: Ib24440bab7b16d0b656bde8b059e7d42cab2c7dc
Baligh Uddin [Mon, 31 Mar 2014 18:25:46 +0000 (11:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I873e19f2b3e2e27eb1bc555ef8cc3cc09f2de493
Auto-generated-cl: translation import
Brian Carlstrom [Mon, 31 Mar 2014 18:20:51 +0000 (11:20 -0700)]
Improve detail message for X509TrustManagerExtensions argument validation
Bug:
13728564
Change-Id: I03d08babcdc0d11baff5e76a339b4285e92edee8
Glenn Kasten [Mon, 31 Mar 2014 18:07:42 +0000 (18:07 +0000)]
Merge "Include more information in AudioTrack JNI error logs"
John Reck [Mon, 31 Mar 2014 18:04:06 +0000 (18:04 +0000)]
Merge "Add invokeFunctor"
Glenn Kasten [Mon, 31 Mar 2014 17:58:35 +0000 (17:58 +0000)]
Merge "Synchronize channel masks in AudioFormat with system/audio.h"
ztenghui [Fri, 28 Mar 2014 20:53:50 +0000 (13:53 -0700)]
Make the reveal animation API public
Change-Id: Iafb17bc768b33b320ffa731a9474be05382126e6
Glenn Kasten [Wed, 28 Nov 2012 22:37:48 +0000 (14:37 -0800)]
Include more information in AudioTrack JNI error logs
Change-Id: I0e57060dd46cce4ec8217bb7d122bd010c974717
Glenn Kasten [Mon, 31 Mar 2014 17:19:48 +0000 (17:19 +0000)]
Merge "Fix warnings"
John Reck [Mon, 31 Mar 2014 17:19:14 +0000 (10:19 -0700)]
Turn on RenderThread
Change-Id: I50fd607420baa438eb16b99b1de8604037c11a88
Glenn Kasten [Mon, 31 Mar 2014 16:53:23 +0000 (16:53 +0000)]
Merge "Fix typo"
Alexandra Gherghina [Mon, 31 Mar 2014 16:15:48 +0000 (16:15 +0000)]
Merge "Mark the keyguard package as required for profile"
Alexandra Gherghina [Fri, 28 Mar 2014 11:44:07 +0000 (11:44 +0000)]
Mark the keyguard package as required for profile
Change-Id: I8edae23c57e1f1af2c086c0f67d9d240d3726d84
Narayan Kamath [Mon, 31 Mar 2014 13:16:16 +0000 (13:16 +0000)]
am
56a8f8b4: resolved conflicts for merge of
439145f0 to klp-modular-dev-plus-aosp
* commit '
56a8f8b48ff1d0855209307b9076d6e9b348b59b':
Don't make isSafeMode a field on the Zygote class.
Narayan Kamath [Mon, 31 Mar 2014 12:54:30 +0000 (13:54 +0100)]
resolved conflicts for merge of
439145f0 to klp-modular-dev-plus-aosp
This isn't a straightforward conflict resolution. This code
has changed significantly. mSafeMode is now a flag on the activity
manager service, and is set when SystemServer calls enterSafeMode.
Change-Id: I1e8ff524566c5e44bb6bf3b138cdebb70004aca3
Narayan Kamath [Mon, 31 Mar 2014 12:42:14 +0000 (12:42 +0000)]
am
ab561f5b: Merge "Don\'t make isSafeMode a field on the Zygote class."
* commit '
ab561f5b4073055c414866ff3dbe8372263474a7':
Don't make isSafeMode a field on the Zygote class.
Narayan Kamath [Mon, 31 Mar 2014 12:32:49 +0000 (12:32 +0000)]
Merge "Don't make isSafeMode a field on the Zygote class."
Narayan Kamath [Fri, 28 Mar 2014 13:10:41 +0000 (13:10 +0000)]
Don't make isSafeMode a field on the Zygote class.
This field is written and read exclusively by the system server,
and should therefore belong to the SystemServer class.
Change-Id: I2708a9a45c0c9cd1a6f563e8cc5844bd8c424bf7
Christoph Studer [Fri, 14 Mar 2014 11:17:12 +0000 (12:17 +0100)]
Notification usage stats
First cut of gathering implicit notification signals and computing
running stats.
Tracks:
1. Post, update, remove by apps
2. Click, dismissal by users
Stats are aggregated on user, user+pkg, and getKey() levels.
Current stats are printed as part of 'dumpsys notification'.
Change-Id: I06ecbf76e517509895f2f9eea5b9d19bf9a34975
Narayan Kamath [Mon, 31 Mar 2014 09:53:35 +0000 (09:53 +0000)]
am
303d666f: am
0e3f3c70: am
91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint"
* commit '
303d666f2e2b37120e0e9de206ce127e2a532026':
Cast CallMethod's size_t parameters to jint
Narayan Kamath [Mon, 31 Mar 2014 09:48:27 +0000 (09:48 +0000)]
am
0e3f3c70: am
91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint"
* commit '
0e3f3c70226640759d5d705233fbe59f525355bb':
Cast CallMethod's size_t parameters to jint
Narayan Kamath [Mon, 31 Mar 2014 09:41:39 +0000 (09:41 +0000)]
am
91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint"
* commit '
91bbb75c75568dee854fb10633f8ce3683265ffd':
Cast CallMethod's size_t parameters to jint
Narayan Kamath [Mon, 31 Mar 2014 09:37:32 +0000 (09:37 +0000)]
Merge "Cast CallMethod's size_t parameters to jint"
Jinsuk Kim [Mon, 31 Mar 2014 01:50:56 +0000 (01:50 +0000)]
am
2e59bd78: am
41eaa32c: Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev
* commit '
2e59bd788546e29e48b85bda72da6af61704113d':
Replace individual methods with a consolidated CEC nativeSendmessage
Jinsuk Kim [Mon, 31 Mar 2014 01:44:51 +0000 (01:44 +0000)]
am
41eaa32c: Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev
* commit '
41eaa32c100d8a903daa7b7d09d34887a3e45ffd':
Replace individual methods with a consolidated CEC nativeSendmessage
Jinsuk Kim [Mon, 31 Mar 2014 01:40:30 +0000 (01:40 +0000)]
Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev
Wink Saville [Sun, 30 Mar 2014 15:23:30 +0000 (15:23 +0000)]
am
80b4e098: am
44b43a51: am
1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue"
* commit '
80b4e09849048a78e08911eff9907cae618eba35':
GlobalActions: Fix Airplane Mode on/off issue
Wink Saville [Sun, 30 Mar 2014 15:17:38 +0000 (15:17 +0000)]
am
44b43a51: am
1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue"
* commit '
44b43a51c7d7e5c2cbe1d9912ee4a21686fa1a58':
GlobalActions: Fix Airplane Mode on/off issue
Wink Saville [Sun, 30 Mar 2014 15:11:27 +0000 (15:11 +0000)]
am
1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue"
* commit '
1e4cad8198056a5e27a7aeb104ceb8ada331eafe':
GlobalActions: Fix Airplane Mode on/off issue
Wink Saville [Sun, 30 Mar 2014 00:15:22 +0000 (00:15 +0000)]
Merge "GlobalActions: Fix Airplane Mode on/off issue"
John Reck [Sat, 29 Mar 2014 03:30:27 +0000 (20:30 -0700)]
Add invokeFunctor
Change-Id: I09e675d3e02e3e528642175ada00b2b17fab7652
Wei Wang [Sat, 29 Mar 2014 02:03:03 +0000 (02:03 +0000)]
am
1b09c97d: am
4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev
* commit '
1b09c97d8a7156a9f35ebab3c98db7b103852a58':
Callback on correct method when status is unsuccessful.
Wei Wang [Sat, 29 Mar 2014 01:57:31 +0000 (01:57 +0000)]
am
4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev
* commit '
4447405d76b5a9152aacadbfdefd1f8fd60a03ad':
Callback on correct method when status is unsuccessful.
Wei Wang [Sat, 29 Mar 2014 01:53:33 +0000 (01:53 +0000)]
Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev
Wei Wang [Sat, 29 Mar 2014 01:40:29 +0000 (18:40 -0700)]
Callback on correct method when status is unsuccessful.
Change-Id: I63c07bbae559765af1aecb492379ab18268336d8
John Reck [Sat, 29 Mar 2014 01:41:50 +0000 (01:41 +0000)]
Merge "Remove kStatusInvoke & kStatusDraw"
John Reck [Sat, 29 Mar 2014 01:41:43 +0000 (01:41 +0000)]
Merge "Remove DisplayList.java"
Chris Craik [Sat, 29 Mar 2014 01:39:56 +0000 (01:39 +0000)]
Merge "Update several stale RenderNode variable names"
Chris Craik [Sat, 29 Mar 2014 01:12:12 +0000 (18:12 -0700)]
Update several stale RenderNode variable names
Change-Id: I61c8c66f5a79e3a89ae0d3cffbfd351c05bd6a2b
Michael Wright [Sat, 29 Mar 2014 01:09:30 +0000 (01:09 +0000)]
am
5d7db503: am
e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev
* commit '
5d7db503bd779fb712391174a2b12327a0f9ec51':
Add InputDevice#supportsSource(int).
Michael Wright [Sat, 29 Mar 2014 01:09:27 +0000 (01:09 +0000)]
am
4669cfff: (-s ours) am
d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev
* commit '
4669cfff1ed590087eade846aee8b4ef58f31739':
Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
Adds API for determining confirm and cancel keys.
Michael Wright [Sat, 29 Mar 2014 00:59:49 +0000 (00:59 +0000)]
am
e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev
* commit '
e9eb58c9a0f48f1ea3afa60f01cfab1f539e5d8e':
Add InputDevice#supportsSource(int).
Michael Wright [Sat, 29 Mar 2014 00:59:46 +0000 (00:59 +0000)]
am
d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev
* commit '
d020fd33d147c88a9cda4976d2fa559e55b4ab03':
Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
Adds API for determining confirm and cancel keys.
Michael Wright [Sat, 29 Mar 2014 00:56:17 +0000 (00:56 +0000)]
Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev
Michael Wright [Sat, 29 Mar 2014 00:56:00 +0000 (00:56 +0000)]
Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev
* changes:
Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
Adds API for determining confirm and cancel keys.
Chris Craik [Sat, 29 Mar 2014 00:07:07 +0000 (00:07 +0000)]
Merge "Simplify RenderNode refresh/build/update process"
Chris Craik [Fri, 28 Mar 2014 23:55:08 +0000 (16:55 -0700)]
Simplify RenderNode refresh/build/update process
A View's RenderNode is created lazily, but the instance never changes
afterward.
Change-Id: I0b05769cd49aa55061d3fb8c2ea55a04e8391e48
Alan Viverette [Fri, 28 Mar 2014 23:59:39 +0000 (23:59 +0000)]
Merge "Fix drag-to-open forwarding behavior"
nagarw [Thu, 20 Feb 2014 11:40:46 +0000 (17:10 +0530)]
GlobalActions: Fix Airplane Mode on/off issue
Issue: Unable to turn off Airplane mode from power button
after phone reboot
Fix: Initialize mHasTelephony before the PhoneStateListener is
registered to the TelephonyManager so that correct value
of mHasTelephony is reflected when onServiceStateChanged
callback is called.
Bug:
13697360
Change-Id: Ide8afd9c16ea90b98b5912dbff440c5fd67b178d
Alan Viverette [Fri, 28 Mar 2014 23:53:56 +0000 (16:53 -0700)]
Fix drag-to-open forwarding behavior
BUG:
13695088
Change-Id: I4c6e824267b145e6dcedb1aa46c8378fd5b6ff83
John Reck [Fri, 28 Mar 2014 23:33:18 +0000 (16:33 -0700)]
Remove kStatusInvoke & kStatusDraw
They are unused
Change-Id: I44ecf1164dc6bc1b09438e733976d5a97a25f00e
Jeff Hao [Fri, 28 Mar 2014 23:40:36 +0000 (23:40 +0000)]
am
f1354dd2: am
d648e5f7: am
e9b4fd07: Merge "Mark constructor as accessible in LayoutInflater."
* commit '
f1354dd206a74e1475e8c1f8682dfd9d5e146f00':
Mark constructor as accessible in LayoutInflater.
Craig Mautner [Fri, 28 Mar 2014 23:40:33 +0000 (23:40 +0000)]
am
1872ce3e: am
155e3133: am
d511bc17: Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off."
* commit '
1872ce3e7af0e2130a9e8f9f52983cd234f6ead0':
[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off.
Michael Wright [Fri, 28 Mar 2014 23:40:30 +0000 (23:40 +0000)]
am
c9b937bb: am
6a14146b: am
e328056d: Merge "Add support for additional international keyboard mappings"
* commit '
c9b937bbfae825e32158e06ca52f320ca3d6f464':
Add support for additional international keyboard mappings
Craig Mautner [Fri, 28 Mar 2014 23:40:27 +0000 (23:40 +0000)]
am
9c99c55d: (-s ours) am
9395dab7: (-s ours) am
ff3362f0: (-s ours) Merge "DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front."
* commit '
9c99c55d03a66ad5ba47584340c527c0f843bbe8':
DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front.
Adam Hampson [Fri, 28 Mar 2014 23:40:23 +0000 (23:40 +0000)]
am
e8609de4: am
594c73fc: Merge "hdmi: cec: add permission name to dump permission denial message" into klp-modular-dev
* commit '
e8609de4fb3635ab7182283e94ac56b48c07463a':
hdmi: cec: add permission name to dump permission denial message
Aaron Whyte [Fri, 28 Mar 2014 23:40:13 +0000 (23:40 +0000)]
am
23fd13de: am
f10d0399: Made secure-adb\'s new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted adb public k
* commit '
23fd13de62762e98c32f2b7525f01f0bcdf416fd':
Made secure-adb's new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted adb public keys.
Selim Gurun [Fri, 28 Mar 2014 23:35:09 +0000 (23:35 +0000)]
Merge "Support for new gTLDs"
Glenn Kasten [Fri, 28 Mar 2014 23:19:52 +0000 (16:19 -0700)]
Use set() return value instead of separate call to initCheck()
Change-Id: I6874ca00512d30824ecec10b8dc289993b985c7b
John Reck [Fri, 28 Mar 2014 23:18:17 +0000 (16:18 -0700)]
Remove DisplayList.java
Bug:
13478302
Change-Id: I88574ec585b7eb165f3009a4f0492c12f70d3513
Jeff Hao [Fri, 28 Mar 2014 23:05:46 +0000 (23:05 +0000)]
am
d648e5f7: am
e9b4fd07: Merge "Mark constructor as accessible in LayoutInflater."
* commit '
d648e5f7ba26fc835c0448740f33c49874d51a3b':
Mark constructor as accessible in LayoutInflater.
Craig Mautner [Fri, 28 Mar 2014 23:05:42 +0000 (23:05 +0000)]
am
155e3133: am
d511bc17: Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off."
* commit '
155e3133407e590f18e7e16eddc6fc743f35b0fd':
[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off.
Michael Wright [Fri, 28 Mar 2014 23:05:36 +0000 (23:05 +0000)]
am
6a14146b: am
e328056d: Merge "Add support for additional international keyboard mappings"
* commit '
6a14146b379b33a6bf947f02b2550fa97c5619b6':
Add support for additional international keyboard mappings
Craig Mautner [Fri, 28 Mar 2014 23:05:33 +0000 (23:05 +0000)]
am
9395dab7: (-s ours) am
ff3362f0: (-s ours) Merge "DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front."
* commit '
9395dab7c38d540bea926307c448d5cc5032ac7d':
DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front.
Adam Hampson [Fri, 28 Mar 2014 23:04:01 +0000 (23:04 +0000)]
am
594c73fc: Merge "hdmi: cec: add permission name to dump permission denial message" into klp-modular-dev
* commit '
594c73fc57c99a0bceaa84ccd7524e5038a17ad8':
hdmi: cec: add permission name to dump permission denial message