OSDN Git Service
Michael Wright [Wed, 14 Jan 2015 21:32:37 +0000 (21:32 +0000)]
am
5497e99c: am
eec75faa: Merge "Clean up graphics resources." into lmp-mr1-dev
* commit '
5497e99c4a749a46b8e9f8312d01639987ba81a0':
Clean up graphics resources.
Michael Wright [Wed, 14 Jan 2015 21:26:52 +0000 (21:26 +0000)]
am
eec75faa: Merge "Clean up graphics resources." into lmp-mr1-dev
* commit '
eec75faaa25b5da3382cf0925a65e9e6bd90fdc9':
Clean up graphics resources.
Michael Wright [Wed, 14 Jan 2015 21:21:39 +0000 (21:21 +0000)]
Merge "Clean up graphics resources." into lmp-mr1-dev
Craig Mautner [Wed, 14 Jan 2015 20:58:12 +0000 (20:58 +0000)]
am
f387d3c8: am
c8ba2e87: Merge "Place window at top when adding by base layer" into lmp-mr1-dev
* commit '
f387d3c87a1730605726c48c7b2c2355b50f4935':
Place window at top when adding by base layer
Craig Mautner [Wed, 14 Jan 2015 20:52:23 +0000 (20:52 +0000)]
am
c8ba2e87: Merge "Place window at top when adding by base layer" into lmp-mr1-dev
* commit '
c8ba2e87a40eb70ad22c62b9768e7691e3ff3bc3':
Place window at top when adding by base layer
Adam Lesinski [Wed, 14 Jan 2015 20:47:47 +0000 (20:47 +0000)]
am
e488ce86: am
94e30215: Merge "AAPT: Handle all old unversioned attribute usage" into lmp-mr1-dev
* commit '
e488ce8668538b45c586eba21f5bca288d749686':
AAPT: Handle all old unversioned attribute usage
Craig Mautner [Wed, 14 Jan 2015 20:46:22 +0000 (20:46 +0000)]
Merge "Place window at top when adding by base layer" into lmp-mr1-dev
Adam Lesinski [Wed, 14 Jan 2015 20:40:42 +0000 (20:40 +0000)]
am
94e30215: Merge "AAPT: Handle all old unversioned attribute usage" into lmp-mr1-dev
* commit '
94e30215f97157500d5f5ca1cec446c7114f54b0':
AAPT: Handle all old unversioned attribute usage
Adam Lesinski [Wed, 14 Jan 2015 20:22:28 +0000 (20:22 +0000)]
Merge "AAPT: Handle all old unversioned attribute usage" into lmp-mr1-dev
Craig Mautner [Wed, 14 Jan 2015 20:20:35 +0000 (12:20 -0800)]
Place window at top when adding by base layer
When addAppWindowToListLocked defaults to adding based on mBaseLayer
it went from the lowest window to the highest window looking for a
window whose base layer was larger and dropping the new window below
that window.
If the Home activity is the InputMethodTarget then when the home
ActivityStack moves to the back the InputMethod will follow. This
puts the InputMethod, with it's high base layer value below most
activities. If a new activity window is added using the mBaseLayer
rule above it was placed at the bottom of the window list below the
InputMethod window. Being at the bottom it never received focus and
input to the activity timed out causing ANR.
This change starts the mBaseLayer search at the top window and works
its way down looking for the first window whose mBaseLayer is less
than or equal to the new window's mBaseLayer and inserting the new
window above that window. This causes it to be placed at the top of
all activities even if the InputMethod is near the bottom.
Fixes bug
17721767.
Change-Id: I037064de7604b670841e985479eb5857b47af1d7
Adam Lesinski [Tue, 13 Jan 2015 21:42:41 +0000 (13:42 -0800)]
AAPT: Handle all old unversioned attribute usage
All references to attributes defined in pre-LOLLIPOP_MR1 SDK
are moved to version qualified resource entries.
Bug:
18221682
Change-Id: Ifd739530ebcf99e6bc7ddb3f10bc5e05f0726e62
Christoph Studer [Wed, 14 Jan 2015 19:24:42 +0000 (19:24 +0000)]
am
a80da9d0: am
b018399a: SysUI: Log lockscreen gestures
* commit '
a80da9d069ba3db60b9b43b4e10294a1700e9ca5':
SysUI: Log lockscreen gestures
Jorim Jaggi [Wed, 14 Jan 2015 19:24:36 +0000 (19:24 +0000)]
am
c1691e3f: am
86e1788d: Merge "Only notify SIM state changes when it has actually changed" into lmp-mr1-dev
* commit '
c1691e3f8b148bc0a986fa7d4c4bfaee56c6442c':
Only notify SIM state changes when it has actually changed
Christoph Studer [Wed, 14 Jan 2015 19:24:30 +0000 (19:24 +0000)]
am
2d26435f: am
bd0db7b1: Merge "SysUI: Log lockscreen state to eventlog" into lmp-mr1-dev
* commit '
2d26435f0e8a46f3653fb6f25dbfd92d90b8d80e':
SysUI: Log lockscreen state to eventlog
Nicolas Prevot [Wed, 14 Jan 2015 19:24:16 +0000 (19:24 +0000)]
am
206d31f5: am
42ebaa43: Merge "Make documentation for cross-profile intent filters clearer." into lmp-mr1-dev
* commit '
206d31f598d499dd5a8659235afada35c3417f94':
Make documentation for cross-profile intent filters clearer.
Paul Jensen [Wed, 14 Jan 2015 19:24:09 +0000 (19:24 +0000)]
am
be61ffa4: am
9f0e9ad4: Merge "Don\'t blindly teardown unvalidated networks when releasing NetworkRequests." into lmp-mr1-dev
* commit '
be61ffa4fe42b4e6fdb677c7b1aeefb43ad3ef9f':
Don't blindly teardown unvalidated networks when releasing NetworkRequests.
Christoph Studer [Wed, 14 Jan 2015 15:27:02 +0000 (15:27 +0000)]
am
b018399a: SysUI: Log lockscreen gestures
* commit '
b018399a3a2762e95126acbe14397eca15bad772':
SysUI: Log lockscreen gestures
Jorim Jaggi [Wed, 14 Jan 2015 15:16:12 +0000 (15:16 +0000)]
am
86e1788d: Merge "Only notify SIM state changes when it has actually changed" into lmp-mr1-dev
* commit '
86e1788db46cdbcc65331dd8d0b9e23241a534fe':
Only notify SIM state changes when it has actually changed
Christoph Studer [Wed, 14 Jan 2015 15:16:07 +0000 (15:16 +0000)]
am
bd0db7b1: Merge "SysUI: Log lockscreen state to eventlog" into lmp-mr1-dev
* commit '
bd0db7b18f2a78b2ac2ff13234bf5b3582c9aec4':
SysUI: Log lockscreen state to eventlog
Christoph Studer [Mon, 22 Dec 2014 20:02:26 +0000 (21:02 +0100)]
SysUI: Log lockscreen gestures
Log the following lockscreen gestures:
* Swipe up to unlock
* Swipe down to enter full shade
* Tap in empty area (causing unlock hint)
* Swipe to camera
* Swipe to dialer
* Tap on lock to lock device
* Tap on notification, activating it
For swipe gestures, includes length and velocity where available.
Bug:
18767135
Change-Id: Ib2c535e3a9d2b378f5a2a0a00c2be3fd916554ac
Jorim Jaggi [Wed, 14 Jan 2015 15:13:05 +0000 (15:13 +0000)]
Merge "Only notify SIM state changes when it has actually changed" into lmp-mr1-dev
Christoph Studer [Wed, 14 Jan 2015 15:10:52 +0000 (15:10 +0000)]
Merge "SysUI: Log lockscreen state to eventlog" into lmp-mr1-dev
Nicolas Prevot [Wed, 14 Jan 2015 13:38:21 +0000 (13:38 +0000)]
am
42ebaa43: Merge "Make documentation for cross-profile intent filters clearer." into lmp-mr1-dev
* commit '
42ebaa434f95417cbf55ef6975fab7cb9d27ab3e':
Make documentation for cross-profile intent filters clearer.
Nicolas Prevot [Wed, 14 Jan 2015 13:33:11 +0000 (13:33 +0000)]
Merge "Make documentation for cross-profile intent filters clearer." into lmp-mr1-dev
Paul Jensen [Wed, 14 Jan 2015 12:42:32 +0000 (12:42 +0000)]
am
9f0e9ad4: Merge "Don\'t blindly teardown unvalidated networks when releasing NetworkRequests." into lmp-mr1-dev
* commit '
9f0e9ad40633f0480c8b6209e52d61c5aac52d1d':
Don't blindly teardown unvalidated networks when releasing NetworkRequests.
Paul Jensen [Wed, 14 Jan 2015 12:38:57 +0000 (12:38 +0000)]
Merge "Don't blindly teardown unvalidated networks when releasing NetworkRequests." into lmp-mr1-dev
Lorenzo Colitti [Wed, 14 Jan 2015 12:06:31 +0000 (12:06 +0000)]
am
792fd3d1: am
2b52cad1: Merge "Switch the connectivity check to its own hostname." into lmp-mr1-dev
* commit '
792fd3d1eea0d4e1c69480684cf3be4e4c215ace':
Switch the connectivity check to its own hostname.
Wink Saville [Wed, 14 Jan 2015 12:06:22 +0000 (12:06 +0000)]
am
657f9a68: am
1a6dd298: Merge "StateMachine.dump produces no output sometimes." into lmp-mr1-dev
* commit '
657f9a680fd1a82d83b7f8b7658388ea3456ee86':
StateMachine.dump produces no output sometimes.
Lorenzo Colitti [Wed, 14 Jan 2015 11:59:46 +0000 (11:59 +0000)]
am
2b52cad1: Merge "Switch the connectivity check to its own hostname." into lmp-mr1-dev
* commit '
2b52cad12e371a173b61257599824934b1a6c930':
Switch the connectivity check to its own hostname.
Wink Saville [Wed, 14 Jan 2015 11:59:41 +0000 (11:59 +0000)]
am
1a6dd298: Merge "StateMachine.dump produces no output sometimes." into lmp-mr1-dev
* commit '
1a6dd2985ef1eab036f6fc77cf723e3f12832e93':
StateMachine.dump produces no output sometimes.
Nicolas Prevot [Mon, 12 Jan 2015 12:32:56 +0000 (12:32 +0000)]
Make documentation for cross-profile intent filters clearer.
Explain why FLAG_MANAGED_CAN_ACCESS_PARENT and FLAG_PARENT_CAN_ACCESS_MANAGED
have these names.
Also do not mention the disambiguation list since there is not always a
disambiguation list shown when resolving cross-profile intent filters.
BUG:
18962528
Change-Id: Ibbb9505dcab7cf17d87435eff2cef3e745e95209
Lorenzo Colitti [Wed, 14 Jan 2015 10:28:23 +0000 (10:28 +0000)]
Merge "Switch the connectivity check to its own hostname." into lmp-mr1-dev
Wink Saville [Wed, 14 Jan 2015 00:52:06 +0000 (00:52 +0000)]
Merge "StateMachine.dump produces no output sometimes." into lmp-mr1-dev
Junda Liu [Wed, 14 Jan 2015 00:17:58 +0000 (00:17 +0000)]
am
ead01845: am
6e410196: Merge "Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev
* commit '
ead0184548fdd341f5903d9ce35604c926dcddde':
Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council.
Junda Liu [Wed, 14 Jan 2015 00:09:53 +0000 (00:09 +0000)]
am
6e410196: Merge "Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev
* commit '
6e41019633975358cf2f84c5d1e09e6e3a049875':
Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council.
Junda Liu [Wed, 14 Jan 2015 00:06:18 +0000 (00:06 +0000)]
Merge "Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev
Justin Harrison [Tue, 13 Jan 2015 23:26:23 +0000 (23:26 +0000)]
am
82008858: Merge "Fix unexpected language changes on SIM card insertion." into lmp-mr1-dev
automerge:
561cf95
* commit '
561cf9595547581e0cc905ed5a05023bf67ca0b8':
Fix unexpected language changes on SIM card insertion.
Eric Laurent [Tue, 13 Jan 2015 23:25:05 +0000 (23:25 +0000)]
am
ad58ca67: Merge "AudioService: handle stream mute by stream alias" into lmp-mr1-dev
automerge:
50085fb
* commit '
50085fbccfd08038ba5ec888621d960dbbe21405':
AudioService: handle stream mute by stream alias
Stuart Scott [Tue, 13 Jan 2015 23:23:20 +0000 (23:23 +0000)]
am
e3b0449b: Merge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev
automerge:
dfb99e8
* commit '
dfb99e82740fe21006bb6972af6af610ed12edbe':
Update javadoc and hide getNameSource and getDataRoaming.
Fyodor Kupolov [Tue, 13 Jan 2015 23:21:43 +0000 (23:21 +0000)]
am
207d7bd3: Merge "Run isKeyguardSecure under system privileges" into lmp-mr1-dev
automerge:
562e87b
* commit '
562e87bdd5eb58a97cce2224c36443f8915fa7d8':
Run isKeyguardSecure under system privileges
Justin Harrison [Tue, 13 Jan 2015 23:15:14 +0000 (23:15 +0000)]
am
82008858: Merge "Fix unexpected language changes on SIM card insertion." into lmp-mr1-dev
* commit '
820088587e732fe04b705248a06f275bf264be33':
Fix unexpected language changes on SIM card insertion.
Eric Laurent [Tue, 13 Jan 2015 23:15:09 +0000 (23:15 +0000)]
am
ad58ca67: Merge "AudioService: handle stream mute by stream alias" into lmp-mr1-dev
* commit '
ad58ca67c6e3a999357f0d4df8daa9fbbe1a2903':
AudioService: handle stream mute by stream alias
Stuart Scott [Tue, 13 Jan 2015 23:15:03 +0000 (23:15 +0000)]
am
e3b0449b: Merge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev
* commit '
e3b0449b0f2fe9f4ed59bd0d209d6b992bfe4372':
Update javadoc and hide getNameSource and getDataRoaming.
Fyodor Kupolov [Tue, 13 Jan 2015 23:14:58 +0000 (23:14 +0000)]
am
207d7bd3: Merge "Run isKeyguardSecure under system privileges" into lmp-mr1-dev
* commit '
207d7bd3a4aca3478910ec740a0c810868fbeabb':
Run isKeyguardSecure under system privileges
Lorenzo Colitti [Tue, 13 Jan 2015 15:16:03 +0000 (00:16 +0900)]
Switch the connectivity check to its own hostname.
Bug:
18467482
Bug:
18869302
Bug:
18924197
Change-Id: I1de478e9c8a165faf6f1bf81e042d1de9e03c3d5
Justin Harrison [Tue, 13 Jan 2015 23:01:38 +0000 (23:01 +0000)]
Merge "Fix unexpected language changes on SIM card insertion." into lmp-mr1-dev
Eric Laurent [Tue, 13 Jan 2015 23:00:38 +0000 (23:00 +0000)]
Merge "AudioService: handle stream mute by stream alias" into lmp-mr1-dev
Stuart Scott [Tue, 13 Jan 2015 22:43:13 +0000 (22:43 +0000)]
Merge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev
Wink Saville [Mon, 12 Jan 2015 19:34:20 +0000 (11:34 -0800)]
StateMachine.dump produces no output sometimes.
If the content to dump is large no output is produced by dump. Change
back to using a loop and flush.
Bug:
18965342
Change-Id: Ibc33da8bfffd5f998a78df0e2d70ed8e8a0aa137
Fyodor Kupolov [Tue, 13 Jan 2015 22:19:23 +0000 (22:19 +0000)]
Merge "Run isKeyguardSecure under system privileges" into lmp-mr1-dev
Junda Liu [Tue, 13 Jan 2015 21:50:25 +0000 (13:50 -0800)]
Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council.
Bug: b/
18983535
Change-Id: I937b7ce38615e07f653d3ee02d734edfcfea3897
Craig Mautner [Tue, 13 Jan 2015 22:05:27 +0000 (22:05 +0000)]
am
ef04ae79: Merge "Complete booting when frontmost activity is idle" into lmp-mr1-dev
automerge:
82da2ee
* commit '
82da2ee927a86114f583b2ea8683076069e761e0':
Complete booting when frontmost activity is idle
Craig Mautner [Tue, 13 Jan 2015 22:03:04 +0000 (22:03 +0000)]
am
31ae1730: Merge "Add debug for ANR" into lmp-mr1-dev
automerge:
0f6da47
* commit '
0f6da477cbf3232996770a17910d3e44a0b893ac':
Add debug for ANR
Craig Mautner [Tue, 13 Jan 2015 21:34:32 +0000 (21:34 +0000)]
am
ef04ae79: Merge "Complete booting when frontmost activity is idle" into lmp-mr1-dev
* commit '
ef04ae79af58cc86c4312fac18c8a4eb24fc73ae':
Complete booting when frontmost activity is idle
Craig Mautner [Tue, 13 Jan 2015 21:34:27 +0000 (21:34 +0000)]
am
31ae1730: Merge "Add debug for ANR" into lmp-mr1-dev
* commit '
31ae17309e8c79c4b1a7b63a9c4bb43ae0849de2':
Add debug for ANR
Craig Mautner [Tue, 13 Jan 2015 21:28:34 +0000 (21:28 +0000)]
Merge "Complete booting when frontmost activity is idle" into lmp-mr1-dev
Craig Mautner [Tue, 13 Jan 2015 21:27:20 +0000 (21:27 +0000)]
Merge "Add debug for ANR" into lmp-mr1-dev
Craig Mautner [Tue, 13 Jan 2015 21:09:22 +0000 (13:09 -0800)]
Add debug for ANR
Help for bug
17721767.
Change-Id: If863f3e6536be8af2c189dcc37d503c4d6b663b4
Tyler Gunn [Tue, 13 Jan 2015 20:58:12 +0000 (20:58 +0000)]
am
0e5b3d4e: am
a27523e3: Merge "Fix for call timer resetting when starting IMS conference call. 1/4" into lmp-mr1-dev
* commit '
0e5b3d4eabfa747bab39117d512d6218b8fa7783':
Fix for call timer resetting when starting IMS conference call. 1/4
Greg Hackmann [Tue, 13 Jan 2015 20:53:06 +0000 (20:53 +0000)]
am
96f7ac84: Merge "Find wall clock RTC through sysfs" automerge:
41ef80e
* commit '
96f7ac84b51c3ceb913e78275e99e2f4f79ebe86':
Find wall clock RTC through sysfs
Greg Hackmann [Tue, 13 Jan 2015 20:47:34 +0000 (20:47 +0000)]
Merge "Find wall clock RTC through sysfs"
automerge:
41ef80e
* commit '
41ef80e7ff739d863ea5df0e129e54f953545212':
Find wall clock RTC through sysfs
Tyler Gunn [Tue, 13 Jan 2015 20:47:18 +0000 (20:47 +0000)]
am
a27523e3: Merge "Fix for call timer resetting when starting IMS conference call. 1/4" into lmp-mr1-dev
* commit '
a27523e3e0fd6c6cab18255151f2f9ec9a72f3d6':
Fix for call timer resetting when starting IMS conference call. 1/4
Jorim Jaggi [Tue, 13 Jan 2015 20:33:45 +0000 (21:33 +0100)]
Only notify SIM state changes when it has actually changed
onSubscriptionInfoChanged gets called quite frequently whenever
something about the connectivity changes, which could lead that the
whole state of the Keyguard was reset. This change actually checks
whether the state has really changed and thus only resets Keyguard
when necessary.
Bug:
18821582
Change-Id: Ia70804d0337b11914c7d57aa4cdc47d585786f1d
Greg Hackmann [Tue, 13 Jan 2015 20:43:35 +0000 (20:43 +0000)]
Merge "Find wall clock RTC through sysfs"
Tyler Gunn [Tue, 13 Jan 2015 20:42:36 +0000 (20:42 +0000)]
Merge "Fix for call timer resetting when starting IMS conference call. 1/4" into lmp-mr1-dev
Stuart Scott [Mon, 12 Jan 2015 23:13:21 +0000 (15:13 -0800)]
Update javadoc and hide getNameSource and getDataRoaming.
Note SubscriptionInfo was not public in 21 and 22 hasn't been released yet.
bug:
18983672
Change-Id: I9e8684eea2462fb655846d0719158d54007fabc5
Eric Laurent [Tue, 13 Jan 2015 20:19:53 +0000 (12:19 -0800)]
AudioService: handle stream mute by stream alias
Handle stream mute/unmute requests at the stream
alias level (like is done volume changes) to be consistent.
E.g a request to mute/unmute a stream will affect all streams
sharing the same alias for volume management.
Bug:
18844550.
Change-Id: Ie2e463c58df0371589150f0ebb9b36c38b14e1be
Greg Hackmann [Wed, 26 Feb 2014 20:22:13 +0000 (12:22 -0800)]
Find wall clock RTC through sysfs
Devices may have multiple RTCs. By default the kernel uses rtc0 to
store the system time, but devices may override this (or even specify
that none of them should be used for system time).
Userspace can indirectly find the designated RTC through sysfs. During
AlarmManagerService initialization, enumerate through all rtc class
devices to locate the device with attribute hctosys=1.
This is only done on devices without /dev/alarm, which has its own
in-kernel mechanism to pick the RTC.
Change-Id: Ife2b342c3590133ed316ddaf1799cbc1bfa6e6d9
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Craig Mautner [Tue, 13 Jan 2015 17:37:08 +0000 (09:37 -0800)]
Complete booting when frontmost activity is idle
The boot process is intended to complete when the frontmost activity
becomes idle. This change fixes a corner case where the system was
booting and the Home activity became idle when it was not at the
front causing the system to never complete booting.
Before ag/603303 a secondary stack was created for the TaskPersister
at the beginning of activity manager systemReady(). Following that
change the secondary stack was created for the first time when a task
was restored from system ui recents when getTaskThumbnail() was
called. At the time it was created it was also moved to the front of
the stack order.
If that stack creation happens to occur after the Home activity is
started but before the Home activity becomes idle then the new stack
will obscure the Home activity and the boot process does not
complete.
1. This change adds a test for an idle activity coming to the front
when a stack is moving to the front and we haven't completed booting
yet. If this situation is detected the boot sequence is then
completed.
2. This change fixes the stack ordering so that creating a new task
when restoring recents does not automatically move the stack to the
front.
Fixes bug
18949470.
Change-Id: I243f0bb4396b518a0a8835c0c7bdccb2581a3520
Wink Saville [Tue, 13 Jan 2015 19:15:58 +0000 (19:15 +0000)]
am
6a903c31: am
84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev
* commit '
6a903c31fede2fabdbcda7b5fe0cddcf467f1eb7':
Rename reg/unreg OnSubscriptionsChangedListener.
Wink Saville [Tue, 13 Jan 2015 19:09:48 +0000 (19:09 +0000)]
am
84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev
* commit '
84c5e8ebf0185ca65d4bab148f6d72d71940aba8':
Rename reg/unreg OnSubscriptionsChangedListener.
Fyodor Kupolov [Tue, 13 Jan 2015 19:06:04 +0000 (11:06 -0800)]
Run isKeyguardSecure under system privileges
In certain cases, isKeyguardSecure calls UserManager.getProfileParent, which
requires MANAGE_USERS permission.
Now the check is done under system privileges.
Bug:
18765066
Change-Id: I6b23aedee06403d36523af5fee9c7db9659284b3
Bryce Lee [Tue, 13 Jan 2015 19:05:15 +0000 (19:05 +0000)]
am
9320e9f0: Merge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-dev
automerge:
e036ce2
* commit '
e036ce2e7044efcc8be71241a7e0a1523955f20c':
Update javadoc for DEFAULT_FEATURES deprecation.
Adam Powell [Tue, 13 Jan 2015 19:03:36 +0000 (19:03 +0000)]
am
69c22e82: Merge "Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout" into lmp-mr1-dev
automerge:
57744dd
* commit '
57744dd139f3d30ed1031319dd64b289a68ac3ba':
Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout
Wink Saville [Tue, 13 Jan 2015 19:02:06 +0000 (19:02 +0000)]
Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev
Bryce Lee [Tue, 13 Jan 2015 19:01:24 +0000 (19:01 +0000)]
am
9320e9f0: Merge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-dev
* commit '
9320e9f0a6af9269bc145ec7ab3d4b351f0614af':
Update javadoc for DEFAULT_FEATURES deprecation.
Adam Powell [Tue, 13 Jan 2015 19:01:19 +0000 (19:01 +0000)]
am
69c22e82: Merge "Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout" into lmp-mr1-dev
* commit '
69c22e82e9c3e95f4689a57320de3199ffd29262':
Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout
Bryce Lee [Tue, 13 Jan 2015 18:59:34 +0000 (18:59 +0000)]
Merge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-dev
Adam Powell [Tue, 13 Jan 2015 18:57:32 +0000 (18:57 +0000)]
Merge "Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout" into lmp-mr1-dev
Winson Chung [Tue, 13 Jan 2015 18:25:06 +0000 (18:25 +0000)]
Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes." into lmp-mr1-dev automerge:
7ce662e -s ours
automerge:
b1a0a57 -s ours
* commit '
b1a0a57ccab94e479087b620dcea2b39225693bb':
DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes.
Winson Chung [Tue, 13 Jan 2015 18:19:39 +0000 (18:19 +0000)]
Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes." into lmp-mr1-dev
automerge:
7ce662e -s ours
* commit '
7ce662ef870df34cd189b4ce9e487e496ba407dd':
DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes.
Winson Chung [Tue, 13 Jan 2015 18:16:21 +0000 (18:16 +0000)]
Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes." into lmp-mr1-dev
Nicolas Prévot [Tue, 13 Jan 2015 17:44:21 +0000 (17:44 +0000)]
Merge "Clarify docs for user restrictions" into lmp-mr1-dev automerge:
6ab76bd
automerge:
e5d3ee8
* commit '
e5d3ee8e4fae72ef554a0e1084e88aea9ed8f020':
Clarify docs for user restrictions
Nicolas Prévot [Tue, 13 Jan 2015 17:39:34 +0000 (17:39 +0000)]
Merge "Clarify docs for user restrictions" into lmp-mr1-dev
automerge:
6ab76bd
* commit '
6ab76bd434d587fecefd5801905b09bcd32b1661':
Clarify docs for user restrictions
Nicolas Prévot [Tue, 13 Jan 2015 17:35:12 +0000 (17:35 +0000)]
Merge "Clarify docs for user restrictions" into lmp-mr1-dev
Bryce Lee [Tue, 13 Jan 2015 17:26:46 +0000 (09:26 -0800)]
Update javadoc for DEFAULT_FEATURES deprecation.
Bug:
18983343
Change-Id: I10936e292edf9146e7acca231632fb704054215c
Ricardo Cervera [Tue, 13 Jan 2015 17:01:48 +0000 (17:01 +0000)]
am
62ceea31: am
f5569413: docs: Fix broken link in Common Intents automerge:
c2d373a automerge:
8eb3060
automerge:
cca3d44
* commit '
cca3d44b700db945e23ad357b031d7f6397e18b9':
docs: Fix broken link in Common Intents
Ricardo Cervera [Tue, 13 Jan 2015 16:55:00 +0000 (16:55 +0000)]
am
62ceea31: am
f5569413: docs: Fix broken link in Common Intents automerge:
c2d373a
automerge:
8eb3060
* commit '
8eb306077d603baae0d8e00a909f97275f83f3db':
docs: Fix broken link in Common Intents
Ricardo Cervera [Tue, 13 Jan 2015 16:49:57 +0000 (16:49 +0000)]
am
62ceea31: am
f5569413: docs: Fix broken link in Common Intents automerge:
c2d373a
* commit '
62ceea31564ac27c84ff78b400f844be98917c29':
docs: Fix broken link in Common Intents
Ricardo Cervera [Tue, 13 Jan 2015 16:42:22 +0000 (16:42 +0000)]
am
f5569413: docs: Fix broken link in Common Intents
automerge:
c2d373a
* commit '
c2d373a0a7bb45e8c8a282781c5bc4f75db86b7d':
docs: Fix broken link in Common Intents
Wink Saville [Tue, 13 Jan 2015 01:11:04 +0000 (17:11 -0800)]
Rename reg/unreg OnSubscriptionsChangedListener.
To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.
Bug:
18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
Ricardo Cervera [Tue, 13 Jan 2015 16:35:04 +0000 (16:35 +0000)]
am
f5569413: docs: Fix broken link in Common Intents
* commit '
f556941357ea391cae6dcd2e22b71a837a216d06':
docs: Fix broken link in Common Intents
Ricardo Cervera [Tue, 13 Jan 2015 16:28:22 +0000 (08:28 -0800)]
docs: Fix broken link in Common Intents
Bug:
18991366
Change-Id: I998e5213bb7117ebd26ab335206f430f60d1c537
Narayan Kamath [Tue, 13 Jan 2015 15:51:57 +0000 (15:51 +0000)]
Fix unexpected language changes on SIM card insertion.
There are two separate issues here that need to be fixed, both
boil down to the fact that adding an imperative (userSetLocale)
to the Configuration is a bad idea. Because of this:
- We'd never persist the first user set configuration if it was en_US,
because of an erroneous call to Configuration.setLocale.
- ActivityManager.getConfiguration would sometimes return a
Configuration with userSetLocale == true, which means callers with
the right permissions would inadvertently persist a locale they didn't
want to persist.
bug:
18879010
Change-Id: Id330ffde9d2a6e516fd60edc33f5529df719c634
Amith Yamasani [Thu, 8 Jan 2015 00:05:05 +0000 (16:05 -0800)]
Clarify docs for user restrictions
Specify which restrictions are not relevant or behave differently
for managed profiles.
Bug:
18768578
Change-Id: Iac1435c5b931cbb889902a9b9e427bc0e0778bf2
Paul Jensen [Tue, 9 Dec 2014 16:43:45 +0000 (11:43 -0500)]
Don't blindly teardown unvalidated networks when releasing NetworkRequests.
These networks may be on their way to becoming validated at which point
they could satisfy the default NetworkRequest. This change unifies the
is-this-network-needed code into a single function.
bug:
18652378
Change-Id: Ia511d5c66be79b47dd7c9348ec02784ab30b960c
Craig Mautner [Tue, 13 Jan 2015 04:20:23 +0000 (04:20 +0000)]
am
1e263d3f: am
66b4d484: Merge "Prevent system server dump stuck by pipe buffer full."
* commit '
1e263d3f140e90966790875a815f23c92550f2f2':
Prevent system server dump stuck by pipe buffer full.
Craig Mautner [Tue, 13 Jan 2015 04:14:01 +0000 (04:14 +0000)]
am
66b4d484: Merge "Prevent system server dump stuck by pipe buffer full."
* commit '
66b4d48469c74f7dd889f3f685b436fcb957bf16':
Prevent system server dump stuck by pipe buffer full.
Craig Mautner [Tue, 13 Jan 2015 04:08:03 +0000 (04:08 +0000)]
Merge "Prevent system server dump stuck by pipe buffer full."
Alan Viverette [Tue, 13 Jan 2015 02:24:11 +0000 (02:24 +0000)]
am
82bdfcfa: Update docs for Window.setElevation(), apply changes immediately automerge:
71922de
* commit '
82bdfcfadc17b8467a0e3c50843997e7957a9452':
Update docs for Window.setElevation(), apply changes immediately