OSDN Git Service
Paul Jensen [Mon, 6 Oct 2014 23:01:26 +0000 (23:01 +0000)]
Merge "Use network-specific HTTP proxy settings in captive portal login app." into lmp-dev
Chris Craik [Mon, 6 Oct 2014 22:06:22 +0000 (22:06 +0000)]
Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
Chris Craik [Mon, 6 Oct 2014 21:50:59 +0000 (14:50 -0700)]
Avoid changeBounds animations on Views that are not yet laidout
bug:
17683930
This means that GONE views with empty bounds don't trigger
ChangeBounds animations the first time they're shown.
Change-Id: I6503c5b0a790d3d31f7566fab27a0b12c5f61f26
Mike Lockwood [Mon, 6 Oct 2014 20:50:18 +0000 (20:50 +0000)]
Merge "Add support for playing audio during bootanimation" into lmp-dev
Mathieu Chartier [Mon, 6 Oct 2014 20:27:07 +0000 (20:27 +0000)]
Merge "Fix incorrect JNI_ABORT" into lmp-dev
Mathieu Chartier [Mon, 6 Oct 2014 19:42:00 +0000 (12:42 -0700)]
Fix incorrect JNI_ABORT
If there is a copy, JNI_ABORT does NOT copy back into the
corresponding java array. Changing this to 0 is what you want since
this will copy the data back if needed and free the temporary
storage.
Bug:
16858794
Change-Id: I3f3b426ea3cbba577bb720532c16ebf7493f1c1c
Amit Mahajan [Mon, 6 Oct 2014 19:17:05 +0000 (19:17 +0000)]
Merge "ATT: Call does not establish to '*1'" into lmp-dev
Geoff Mendal [Mon, 6 Oct 2014 19:10:24 +0000 (19:10 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Christopher Tate [Mon, 6 Oct 2014 19:09:11 +0000 (19:09 +0000)]
Merge "adb backup/restore fixes" into lmp-dev
Bing Gao [Fri, 3 Oct 2014 19:56:04 +0000 (12:56 -0700)]
ATT: Call does not establish to '*1'
Bug:
17809849
Change-Id: I43566c9f3b7a72b06a4b5f2a0a312ac42410269d
Dianne Hackborn [Mon, 6 Oct 2014 18:48:33 +0000 (18:48 +0000)]
Merge "Fix issue #
17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev
Geoff Mendal [Mon, 6 Oct 2014 18:34:20 +0000 (11:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iccf9bb82d63d8e5033f916ad5c89cff245ef2087
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Oct 2014 18:32:18 +0000 (18:32 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
John Spurlock [Mon, 6 Oct 2014 17:54:40 +0000 (17:54 +0000)]
Merge "Fix NPE in StrictMode handling." into lmp-dev
Geoff Mendal [Mon, 6 Oct 2014 17:54:01 +0000 (10:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2100b649d1f2866cdc5ffd13f264afba347b6685
Auto-generated-cl: translation import
Andrew Solovay [Mon, 6 Oct 2014 17:51:52 +0000 (17:51 +0000)]
Merge "Removed preview license." into lmp-dev
John Spurlock [Mon, 6 Oct 2014 16:36:45 +0000 (12:36 -0400)]
Fix NPE in StrictMode handling.
Bug:
17875462
Change-Id: I0bf31abe2d07335addd57976aca110565bb63cc4
Yuncheol Heo [Mon, 6 Oct 2014 16:16:45 +0000 (16:16 +0000)]
Merge "CEC: Reset active source status on routing control" into lmp-dev
Jinsuk Kim [Mon, 6 Oct 2014 05:28:06 +0000 (14:28 +0900)]
CEC: Reset active source status on routing control
Set active source status to false when broadcast routing control
commands indicate other device is about to be the new active source.
Bug:
17840270
Change-Id: I176e21ec8789624e29421b912ba641a21f0f5f21
Jeff Sharkey [Mon, 6 Oct 2014 04:01:33 +0000 (04:01 +0000)]
Merge "Recover from missing upgrade to system package." into lmp-dev
Jeff Sharkey [Sun, 5 Oct 2014 21:12:42 +0000 (14:12 -0700)]
Recover from missing upgrade to system package.
When a system app has been upgraded, we mark the built-in version as
disabled, and skip it when parsing built-in apps, since we expect
the userdata version to be scanned a few moments later.
However, in very rare cases we can end up missing the expected
userdata version, and we'd end up dropping the package entirely, even
though we have a built-in version to fall back to. This change
handles that case by rescanning and enabling the built-in version when
the userdata version never materializes.
Also include critical log messages in check-in dumpsys to help track
down how we ended up in this state.
Bug:
17805839
Change-Id: I9971f882f9bb8ab7934c20b04e0b72366c4d04d0
Baligh Uddin [Sun, 5 Oct 2014 17:49:44 +0000 (17:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 5 Oct 2014 17:44:57 +0000 (17:44 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Jeff Sharkey [Sun, 5 Oct 2014 01:06:26 +0000 (01:06 +0000)]
Merge "Correctly rollback failed system app installs." into lmp-dev
Baligh Uddin [Sat, 4 Oct 2014 21:27:49 +0000 (14:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ied21f2af367832b5b11dc1ddc6f0927e47f1e113
Auto-generated-cl: translation import
Baligh Uddin [Sat, 4 Oct 2014 18:36:29 +0000 (11:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id8ff929363bf25f7a8971563db3fc39225016faa
Auto-generated-cl: translation import
Christopher Tate [Sat, 4 Oct 2014 01:26:29 +0000 (18:26 -0700)]
adb backup/restore fixes
Bug
17811327 : teach adb restore about the new widget metadata entries
Bug
14165872 : -nosystem should not act like -onlysystem
Change-Id: I39da0ba80df7c5309a78ec1fa38016cebd80aa5f
Jorim Jaggi [Fri, 3 Oct 2014 23:54:06 +0000 (23:54 +0000)]
Merge "Fix blank Keyguard #4" into lmp-dev
Jeff Sharkey [Fri, 3 Oct 2014 23:48:11 +0000 (16:48 -0700)]
Correctly rollback failed system app installs.
Fix bug where we disabled system app, but never turned it back on
when the scanPackageLI() failed.
Bug:
17805839
Change-Id: I73999263aee703af187afd980fa0d0ce8451cf0c
Robert Greenwalt [Fri, 3 Oct 2014 23:41:54 +0000 (23:41 +0000)]
Merge "Switch the NetworkInfo.mIsAvailable default" into lmp-dev
Svetoslav [Fri, 3 Oct 2014 23:36:16 +0000 (23:36 +0000)]
Merge "Clear identity before calling into the mount service." into lmp-dev
Svetoslav [Fri, 3 Oct 2014 23:33:11 +0000 (23:33 +0000)]
Merge "TouchExploer computes incorrectly the click location." into lmp-dev
Svetoslav [Fri, 3 Oct 2014 23:32:23 +0000 (16:32 -0700)]
Clear identity before calling into the mount service.
bug:
17787265
Change-Id: I4b9268d101e9ccfc30876fbf54bf28bb41fb4be6
vandwalle [Fri, 3 Oct 2014 23:31:49 +0000 (23:31 +0000)]
Merge "add millisecond timestamp to locallog" into lmp-dev
Dianne Hackborn [Fri, 3 Oct 2014 23:26:04 +0000 (16:26 -0700)]
Fix issue #
17752399: Multiple apps broken by GET_TASKS permission change
Keep around GET_TASKS as a permission available to apps, so apps still
think they have it and don't get all uppity because they don't.
Add a new REAL_GET_TASKS that is the actual permission now.
Plus some temporary compatibility code until everyone can transition
fromn GET_TASKS to REAL_GET_TASKS.
Change-Id: I12c1102eed24844685dcbd2fa3b612811603958f
Svetoslav [Fri, 3 Oct 2014 22:40:05 +0000 (15:40 -0700)]
TouchExploer computes incorrectly the click location.
If there is accessibilty focus and the user touch explores
location that does not change accessibility focus that is
not in the app window, e.g. system bar, double tap does not
click on the system UI affordance.
bug:
17588024
Change-Id: I6c8c0f65b208ae1d3f31d7f06b0721dc223ec19f
Robert Greenwalt [Fri, 3 Oct 2014 23:05:36 +0000 (16:05 -0700)]
Switch the NetworkInfo.mIsAvailable default
The placeholder for disconnected networks was setting it to false, but
this technically means that we know an attempt to connect to that
network will fail (which we don't really now). Some applications use
this an decide not to bother trying - an MMS app for example would
never send an MMS because it thinks the network is never available.
This is a L regression.
bug:
17669247
Change-Id: Id6041f226da069c267c56418d42c55978c36c66f
Jorim Jaggi [Fri, 3 Oct 2014 22:17:20 +0000 (15:17 -0700)]
Fix blank Keyguard #4
When we were fading out the preview for phone/camera to crossfade to
the real application, it might have been that showKeyguard was
called in the middle of this transition. This change makes sure that
we cancel this animation when showing the keyguard.
Bug:
17439581
Change-Id: I89cacf7ecf43d37ea979418b976390272510a09d
Mike Lockwood [Thu, 2 Oct 2014 23:08:47 +0000 (16:08 -0700)]
Add support for playing audio during bootanimation
The bootanimation daemon will play 16 bit WAV files contained in bootanimation.zip
For this to work, the bootanimation.zip must contain an audio_conf.txt file,
which contains parameters to be used for the tinyalsa pcm_open call
as well as mixer parameters to set before attempting to play the sound.
If the bootanimation finds an audio_conf.txt file, then it will look for a file named
"audio.wav" in each of the part subdirectories. If audio.wav is found, it will play that
WAV file starting at the beginning of that part.
The code for this is based on the tinyplay utility in tinyalsa.
The audio_conf.txt and must begin with the following header:
card=<ALSA card number>
device=<ALSA device number>
period_size=<period size>
period_count=<period count>
This header is followed by zero or more mixer settings, each with the format:
mixer "<name>" = <value list>
Since mixer names can contain spaces, the name must be enclosed in double quotes.
The values in the value list can be integers, booleans (represented by 0 or 1)
or strings for enum values.
Finally I should mention that this change is not the right approach.
Instead of going straight to ALSA we should be using the mediaserver instead.
But mediaserver isn't ready in time due to interactions with the system server, and there
isn't time to fix this for the current release. We need to fix that for the next one.
Bug:
17674304
Change-Id: Ic391ade61c941d0a24f4d64fe005ac9375a23fa9
vandwalle [Thu, 2 Oct 2014 01:28:38 +0000 (18:28 -0700)]
add millisecond timestamp to locallog
Change-Id: I33d8672efd2747ed3f49dd8d5bcd5f47bf418053
Jeff Sharkey [Fri, 3 Oct 2014 22:35:18 +0000 (22:35 +0000)]
Merge "More durable logging around system app upgrades." into lmp-dev
Jorim Jaggi [Fri, 3 Oct 2014 22:33:05 +0000 (22:33 +0000)]
Merge "Fix blank lockscreen #3" into lmp-dev
John Reck [Fri, 3 Oct 2014 22:22:51 +0000 (22:22 +0000)]
Merge "Cleanup DeferredLayerUpdater" into lmp-dev
Jeff Sharkey [Fri, 3 Oct 2014 22:09:14 +0000 (15:09 -0700)]
More durable logging around system app upgrades.
We've been seeing some really funky behavior when upgrading or
downgrading system apps around OTA time. Put more of these one-time
logs into durable storage to help investigate.
Bug:
17805839
Change-Id: If898d7df229c1f71e598b0d965325c272060e5e7
Adam Lesinski [Fri, 3 Oct 2014 22:06:02 +0000 (22:06 +0000)]
Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-dev
John Reck [Fri, 3 Oct 2014 22:02:19 +0000 (15:02 -0700)]
Cleanup DeferredLayerUpdater
Bug:
17765082
DeferredLayerUpdater had fallen behind RT updates. Re-snap to
latest expectations, ensuring to call requireGlContext() prior
to detachSurfaceTexture to avoid leaking SurfaceTextures
Change-Id: Ic65fb9831e5284f658866da8da9ad5af1d227699
Adam Lesinski [Fri, 3 Oct 2014 21:57:28 +0000 (14:57 -0700)]
AAPT: Gate v21 resource synthesizing logging behind -v flag
This is verbose information and should be hidden behind the -v flag.
Bug:
17822471
Change-Id: I36e2c6beb54669a31cde73416427477a80ded8a6
Jorim Jaggi [Fri, 3 Oct 2014 21:24:55 +0000 (14:24 -0700)]
Fix blank lockscreen #3
Bug:
17439581
Change-Id: Ic8cb7f32200b541ecc8fa36ad2517975cec0b545
Svetoslav Ganov [Fri, 3 Oct 2014 20:34:37 +0000 (20:34 +0000)]
Revert "TouchExplorer computes incorrectly the click location."
This reverts commit
851a5059a47cbf76e530c9d050a677cb6e3f8657 as
it creates a regression. Let us revert this and correctly fix the
issue the original change was trying to address.
bug:
17789608
Change-Id: I8abb1a61d5310430e839e4ef60e7ca5cc0cbdd80
Deepanshu Gupta [Fri, 3 Oct 2014 20:30:43 +0000 (20:30 +0000)]
Merge "Minor style changes." into lmp-dev
Dianne Hackborn [Fri, 3 Oct 2014 20:15:11 +0000 (20:15 +0000)]
Merge "Fix issue #
17811029: Settings provider race when removing users" into lmp-dev
RoboErik [Fri, 3 Oct 2014 20:13:27 +0000 (20:13 +0000)]
Merge "Fix regression in RCC.editMetadata(false)" into lmp-dev
Christopher Tate [Fri, 3 Oct 2014 19:56:35 +0000 (19:56 +0000)]
Merge "Fix alarm delivery-order sorting" into lmp-dev
RoboErik [Fri, 3 Oct 2014 19:45:58 +0000 (12:45 -0700)]
Fix regression in RCC.editMetadata(false)
Found a very simple fix. Just set the cached metadata so we have
it to copy over when editMetadata(false) is called.
bug:
17796693
Change-Id: Ib27f0c3d28e7f2a3c7d9495697f36c8045e2bcf6
Guang Zhu [Fri, 3 Oct 2014 19:38:36 +0000 (19:38 +0000)]
Merge "Prevent monkey from triggering bugreport" into lmp-dev
Christopher Tate [Fri, 3 Oct 2014 00:27:57 +0000 (17:27 -0700)]
Fix alarm delivery-order sorting
We also refine the order of delivery within any given package. Now,
we identify which apps have wakeup alarms being delivered in the
current pass, and deliver all of that app's alarms before moving
on to alarm delivery to apps who are only receiving non-wakeup alarms
in the current delivery pass. The TIME_TICK alarm is also hoisted to
the start of the current delivery pass if present.
Bug
17778686
Change-Id: I6306a00fe657787a77d0254c0807ac51e810fdcf
Dianne Hackborn [Fri, 3 Oct 2014 19:29:43 +0000 (12:29 -0700)]
Fix issue #
17811029: Settings provider race when removing users
Change-Id: Ia40d0a9c161b765d1340db5390d0acdbfc050b81
Guang Zhu [Fri, 3 Oct 2014 19:23:43 +0000 (12:23 -0700)]
Prevent monkey from triggering bugreport
Change-Id: Ifa6f06f7dfa63b740352ad7388f33911649afcb0
Dianne Hackborn [Fri, 3 Oct 2014 18:26:40 +0000 (11:26 -0700)]
Fix issue #
17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...
...'java.lang.String java.lang.String.substring(int)' on a null object reference
Change-Id: I4a78653174da398a4edd23b2bc099598548b79c2
Ricardo Cervera [Fri, 3 Oct 2014 18:11:52 +0000 (18:11 +0000)]
am
1242af06: am
32cfe2bb: am
d37afa37: Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs
* commit '
1242af060bec63ec3a37512ebbbdbe545bd9f0f7':
docs: Unbuntu troubleshooting link to CamelCase ID
Ricardo Cervera [Fri, 3 Oct 2014 18:05:41 +0000 (18:05 +0000)]
am
32cfe2bb: am
d37afa37: Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs
* commit '
32cfe2bbc71091a1ab282d5c7e4df7db5f6051e6':
docs: Unbuntu troubleshooting link to CamelCase ID
Ricardo Cervera [Fri, 3 Oct 2014 18:00:37 +0000 (18:00 +0000)]
am
d37afa37: Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs
* commit '
d37afa37452d5e5dab3704ecab0ab7cebb3da292':
docs: Unbuntu troubleshooting link to CamelCase ID
Ricardo Cervera [Fri, 3 Oct 2014 17:55:34 +0000 (17:55 +0000)]
Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs
Paul Jensen [Thu, 2 Oct 2014 17:43:39 +0000 (13:43 -0400)]
Use network-specific HTTP proxy settings in captive portal login app.
The HTTP proxy system properties are set based on the proxy configured
for the network the captive portal login app is operating on. These
system properties are subsequently read by the WebView used to perform
the sign-in.
This is a short-term fix using reflection. This allows users with
cellular providers that use proxies to sign into WiFi captive portals.
The long-term fix could involve:
1. Sending out a network-specific proxy config changed broadcast, and
2. Modifying the ActivityThread to set proxy system properties for
Networks selected with setProcessDefaultNetwork(), and
3. Modifying WebView to read from the proxy system properties when
PROXY_CHANGE_ACTION broadcasts are received.
bug:
17679789
Change-Id: I3ada0470ad085df1a4452b4a655ac35f310d2241
Ricardo Cervera [Fri, 3 Oct 2014 16:44:25 +0000 (09:44 -0700)]
docs: Unbuntu troubleshooting link to CamelCase ID
Change-Id: I705d17346c470563c350df9bb17d23f3fda5fbc5
Robert Greenwalt [Fri, 3 Oct 2014 15:36:38 +0000 (15:36 +0000)]
Merge "Send callbacks for Net property changes" into lmp-dev
John Spurlock [Fri, 3 Oct 2014 13:55:23 +0000 (13:55 +0000)]
Merge "Update framework icons for media & alarm streams." into lmp-dev
John Spurlock [Fri, 3 Oct 2014 13:49:42 +0000 (13:49 +0000)]
Merge "Disable notification effects during phone calls." into lmp-dev
Andreas Gampe [Fri, 3 Oct 2014 04:30:04 +0000 (04:30 +0000)]
Merge "Revert "Revert "Frameworks/base: Update to preloaded-classes""" into lmp-dev
Robert Greenwalt [Tue, 30 Sep 2014 23:50:07 +0000 (16:50 -0700)]
Send callbacks for Net property changes
LinkProperties and NetworkCapabilities changes were not calling app callbacks.
bug:
17681483
Change-Id: I67dac3c4dc1284f5c4bfb24de239da4ec776336f
Paul Jensen [Fri, 3 Oct 2014 02:18:11 +0000 (02:18 +0000)]
Merge "Send updated NetworkAgent score to NetworkFactories when validated." into lmp-dev
Paul Jensen [Fri, 3 Oct 2014 02:16:42 +0000 (02:16 +0000)]
Merge "Allow any unvalidated Network to satisfy NetworkRequests." into lmp-dev
Andreas Gampe [Fri, 3 Oct 2014 02:00:29 +0000 (02:00 +0000)]
Revert "Revert "Frameworks/base: Update to preloaded-classes""
This reverts commit
16626a7ee9f18c70b2f6437b4ab85753dbbb2263.
Remove three classes that break Shamu booting.
Bug:
17480683
Bug:
17791590
Change-Id: Ic487c5344d4186ea5205f117f07ca3ab7d945fb7
John Spurlock [Thu, 2 Oct 2014 16:16:02 +0000 (12:16 -0400)]
Disable notification effects during phone calls.
Listen for phone call state changes in NoMan, and disable
incoming non-call notification effects when non-idle.
Bug:
17658454
Change-Id: I6f7d66413970fbff6822ab29a12f91cbed068261
Dianne Hackborn [Fri, 3 Oct 2014 00:40:25 +0000 (00:40 +0000)]
Merge "Maybe fix issue #
17449495: Nakasi is pretty laggy/slow to do anything" into lmp-dev
Dianne Hackborn [Fri, 3 Oct 2014 00:21:27 +0000 (17:21 -0700)]
Maybe fix issue #
17449495: Nakasi is pretty laggy/slow to do anything
Tweak the oom tuning to raise everything by 50%. This is the same
increase we did for Volantis; I am thinking that most of the issue
there was not it being 64 bit, but it being tighter on RAM. From
my testing, it looks like in user switching there was some paging
going on with Nakasi, and with this change things seem to be better.
We should probably revisit this for future work on RAM. It seems
likely that a 64 bit device will need more RAM, so probably the value
I am picking here is larger than we actually need for other devices.
I think this is the safest change at this point though -- it leaves
Volantis the same, where we already had tweaked it to address paging
issues, raises it on Nakasi (to the same value as Volantis) where we
seem to have paging issues, and on our other devices also raises it
but those are generally not under memory pressure so this shouldn't
really make a difference.
Change-Id: Ib19394068734d322a015ed07370d9d4961877e4b
John Spurlock [Thu, 2 Oct 2014 23:17:19 +0000 (19:17 -0400)]
Update framework icons for media & alarm streams.
Update resources to new style and remove obsolete items.
Bug:
17762712
Change-Id: Ibec121828084934cc066afe117f66b6a0eea603f
Andrew Solovay [Tue, 30 Sep 2014 22:38:48 +0000 (15:38 -0700)]
Removed preview license.
Per JoeFernandez@ 's request, killed the preview license with fire
and scraped its name from the TOC.
You can verify its annihilation on my staged doc:
http://asolovay.mtv.corp.google.com:9191/preview/
So let it be written, so let it be done.
Change-Id: I94682fc50f17665756ca789b63f0c89d3ac3ea76
Alan Viverette [Thu, 2 Oct 2014 23:10:04 +0000 (23:10 +0000)]
Merge "Fix theme propagation to contained android:drawable elements" into lmp-dev
Evan Charlton [Thu, 2 Oct 2014 23:05:22 +0000 (23:05 +0000)]
Merge "Add @SystemApi to missing TelecomManager methods" into lmp-dev
Rich Slogar [Thu, 2 Oct 2014 22:57:45 +0000 (22:57 +0000)]
am
721b3efc: am
46d8d0cd: am
c470faab: docs:ADT 23.0.4 doc updates
* commit '
721b3efc205442e255170d0185ae374b5a5ddc50':
docs:ADT 23.0.4 doc updates
Alan Viverette [Thu, 2 Oct 2014 22:53:31 +0000 (15:53 -0700)]
Fix theme propagation to contained android:drawable elements
BUG:
17790666
Change-Id: I6733a98e779cad0d384b917c57d2b3409a166c02
Rich Slogar [Thu, 2 Oct 2014 22:52:49 +0000 (22:52 +0000)]
am
46d8d0cd: am
c470faab: docs:ADT 23.0.4 doc updates
* commit '
46d8d0cdb349ca0a3f6ef199e1cc1dcba4c2d6eb':
docs:ADT 23.0.4 doc updates
Dianne Hackborn [Thu, 2 Oct 2014 22:49:41 +0000 (22:49 +0000)]
Merge "SDK only: Update docs to reflect current implementation." into lmp-dev
Rich Slogar [Thu, 2 Oct 2014 22:47:15 +0000 (22:47 +0000)]
am
c470faab: docs:ADT 23.0.4 doc updates
* commit '
c470faab3ee47b5643ee6b0a97c925c8f0f587fa':
docs:ADT 23.0.4 doc updates
Jason Monk [Thu, 2 Oct 2014 22:36:45 +0000 (22:36 +0000)]
Merge "Synchronize on all sendProxyBroadcast calls" into lmp-dev
Rich Slogar [Thu, 2 Oct 2014 22:13:09 +0000 (15:13 -0700)]
docs:ADT 23.0.4 doc updates
Change-Id: Ibf412802e7c98ed3beff6c61394f1b3962254d9a
Jeff Brown [Thu, 2 Oct 2014 22:04:08 +0000 (22:04 +0000)]
Merge "Fix race in RecognizerService teardown." into lmp-dev
Joe Fernandez [Thu, 2 Oct 2014 21:50:09 +0000 (21:50 +0000)]
am
285859b1: am
d36dbe09: am
e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs
* commit '
285859b13728c5cfb6124c11212978f8f95cd9de':
Revert "docs: Update for Android 23.0.4"
Baligh Uddin [Thu, 2 Oct 2014 21:38:24 +0000 (21:38 +0000)]
Merge "Fix a bug with screen brightness during screen off animation." into lmp-dev
Christopher Tate [Thu, 2 Oct 2014 21:32:47 +0000 (21:32 +0000)]
Merge "Tweak wallpaper restore acceptance heuristics" into lmp-dev
Joe Fernandez [Thu, 2 Oct 2014 21:32:15 +0000 (21:32 +0000)]
am
d36dbe09: am
e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs
* commit '
d36dbe09a18fc7226029e841cb2a856fb83c81f2':
Revert "docs: Update for Android 23.0.4"
Christopher Tate [Thu, 2 Oct 2014 20:39:12 +0000 (13:39 -0700)]
Tweak wallpaper restore acceptance heuristics
We now accept for restore any image that is at least wide enough to
fit the screen, and has a height within a comfortable margin of the
previously stated target.
Bug
17677006
Change-Id: I5937a82ddfbfa0bbb30d568621eb48e4b3533fac
Etan Cohen [Thu, 2 Oct 2014 21:16:28 +0000 (21:16 +0000)]
Merge "Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA." into lmp-dev
Joe Fernandez [Thu, 2 Oct 2014 21:14:59 +0000 (21:14 +0000)]
am
e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs
* commit '
e961d0b521bc25caf964258e75fef3d3ea22e4ac':
Revert "docs: Update for Android 23.0.4"
Joe Fernandez [Thu, 2 Oct 2014 21:08:27 +0000 (21:08 +0000)]
Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs
Joe Fernandez [Thu, 2 Oct 2014 21:07:49 +0000 (21:07 +0000)]
Revert "docs: Update for Android 23.0.4"
This reverts commit
f34d0e69033165b7a6e9c73b99f4ef6ac36b3896.
Change-Id: I4d521392733f1b028c72d4623d6d69a4c5910bc4
Evan Charlton [Thu, 2 Oct 2014 20:45:27 +0000 (13:45 -0700)]
Add @SystemApi to missing TelecomManager methods
A few methods (which should be exposed) were missing @SystemApi
annotations.
TelecomManager#addNewIncomingCall
TelecomManager#registerPhoneAccount
TelecomManager#unregisterPhoneAccount
Bug:
17786491
Change-Id: Idf318cf6238668762c00ed0913a9c0ccd5bcb884
Matthew Williams [Thu, 2 Oct 2014 04:12:28 +0000 (04:12 +0000)]
Revert "Protect LOGIN_ACCOUNTS_CHANGED receiver in SyncManager"
This reverts commit
cf2bd348e73e880fe5bfc7a025732d4ec606ff1f.
Reverted because for account removal the AccountManagerService
delegates the sending of LOGIN_ACCOUNTS_CHANGED to the authenticator.
See b/
17511110.
Change-Id: Ic03016af98070b4add5f7a5ec1fdff32ba63298e
Jing Ji [Wed, 1 Oct 2014 18:31:19 +0000 (13:31 -0500)]
Allow system app to take ownership of built-in permissions
Previous commit
bfed9f34c makes the preloaded system app take
precedence over third-party apps when defining permissions, but
it also makes it be able to override android built-in permissions.
Now allow preloaded system app to take the ownership of built-in
permissions instead of overriding it.
Change-Id: I10d588d0284e4316ea4be552fd6191f33e3c725b