OSDN Git Service
Dongwon Kang [Fri, 5 Dec 2014 04:08:21 +0000 (04:08 +0000)]
Merge "TIF: handle a race condition when a session is crashed" into lmp-mr1-dev
Dongwon Kang [Fri, 5 Dec 2014 04:08:03 +0000 (04:08 +0000)]
Merge "TIF: increase the time threshold for tune operation which was too harsh" into lmp-mr1-dev
Filip Gruszczynski [Fri, 5 Dec 2014 02:34:26 +0000 (02:34 +0000)]
am
26b18771: Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev
* commit '
26b187711fdf6224e14df465a58f30f510011b49':
Private Window flag to disable touch events in WallpaperService.
Ricardo Cervera-Navarro [Fri, 5 Dec 2014 02:34:02 +0000 (02:34 +0000)]
am
8242ae16: am
dddc2981: am
1782e526: Merge "Revert "docs: Long press to dismiss fix by Wayne"" into lmp-docs
* commit '
8242ae16b6f0f293ececb75228fb1364061171d0':
Revert "docs: Long press to dismiss fix by Wayne"
Raph Levien [Fri, 5 Dec 2014 02:14:51 +0000 (02:14 +0000)]
Merge "Change Linkify leniency to VALID" into lmp-mr1-dev
Nancy Chen [Fri, 5 Dec 2014 01:53:21 +0000 (01:53 +0000)]
Merge "Use TelecomManager to call TelephonyManager#getVoicemailNumber (1/2)" into lmp-mr1-dev
Filip Gruszczynski [Fri, 5 Dec 2014 01:42:01 +0000 (01:42 +0000)]
Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev
Dongwon Kang [Thu, 4 Dec 2014 09:08:00 +0000 (18:08 +0900)]
TIF: handle a race condition when a session is crashed
Currently, TIMS has a logic for handling session crash (binderDied).
However, this can be racy if the client calls an operation right before it gets
ITvInputClient.onSessionReleased() callback. This change handles those request
gracefully without causing a crash in the client side.
Bug:
18612616
Change-Id: I37241e05d53f3cca693e0239fc9ad5dce02fc925
Dianne Hackborn [Fri, 5 Dec 2014 01:35:19 +0000 (01:35 +0000)]
Merge "Fix issue #
18593636: Turn on "kill important processes that..." into lmp-mr1-dev
Alan Viverette [Thu, 4 Dec 2014 22:10:16 +0000 (14:10 -0800)]
Avoid extra saveLayer calls in RippleDrawable, fix docs
Also fixes opacity returned from InsetDrawable to accurately reflect
the transparent inset area and updates button to correctly use tint.
BUG:
18226391
Change-Id: Ia9a88d9d663990a6829d2f251c7f59ea2a79d816
Ricardo Cervera-Navarro [Fri, 5 Dec 2014 00:42:03 +0000 (00:42 +0000)]
am
dddc2981: am
1782e526: Merge "Revert "docs: Long press to dismiss fix by Wayne"" into lmp-docs
* commit '
dddc29815375022e52c2945e8cab40f61f56483c':
Revert "docs: Long press to dismiss fix by Wayne"
Svetoslav [Thu, 4 Dec 2014 20:50:11 +0000 (12:50 -0800)]
Ensure all events from a showing window are dispatched.
Accessibility services may opt-in to introspect the interactive
windows on the screen. If window introspection is enabled there
is a case where some events from a showing window are received
before the updated window state from the window manager. Now the
window manager sends over the windows before notifying the app
for the focus change.
bug:
18625996
Change-Id: Ic481e01efbe12dc92f090f799feeb236672fc7b3
Ricardo Cervera-Navarro [Fri, 5 Dec 2014 00:33:35 +0000 (00:33 +0000)]
am
1782e526: Merge "Revert "docs: Long press to dismiss fix by Wayne"" into lmp-docs
* commit '
1782e526c73bfd2f4eb24b024a5019b66dbdaade':
Revert "docs: Long press to dismiss fix by Wayne"
Ricardo Cervera-Navarro [Fri, 5 Dec 2014 00:27:59 +0000 (00:27 +0000)]
Merge "Revert "docs: Long press to dismiss fix by Wayne"" into lmp-docs
Ricardo Cervera-Navarro [Fri, 5 Dec 2014 00:27:09 +0000 (00:27 +0000)]
Revert "docs: Long press to dismiss fix by Wayne"
This reverts commit
6ee2ca2f1e24d27c7a1e2430ad0272ef9f921a4a.
Change-Id: I07a196ca1e5ae827a77c9a17ddc90d8e14129f67
Lajos Molnar [Fri, 5 Dec 2014 00:21:01 +0000 (00:21 +0000)]
Merge "media: allow full range of Vorbis sampling rates" into lmp-mr1-dev
Jinsuk Kim [Fri, 5 Dec 2014 00:05:08 +0000 (00:05 +0000)]
Merge "CEC: Introduce the retry for commands on the new device discovery." into lmp-mr1-dev
Dianne Hackborn [Fri, 5 Dec 2014 00:01:56 +0000 (00:01 +0000)]
Merge "Add test for isolated services." into lmp-mr1-dev
Nick Chalko [Fri, 5 Dec 2014 00:00:21 +0000 (00:00 +0000)]
Merge "docs: Fix typo, use --> user" into lmp-mr1-dev
Dongwon Kang [Thu, 4 Dec 2014 23:57:48 +0000 (08:57 +0900)]
TIF: increase the time threshold for tune operation which was too harsh
Bug:
18612616
Change-Id: I62ddde2f9796f3b1dd8240f5c88fbff234b3618b
Chet Haase [Thu, 4 Dec 2014 23:26:58 +0000 (23:26 +0000)]
Merge "Fix seeking behavior" into lmp-mr1-dev
Chet Haase [Wed, 3 Dec 2014 01:51:34 +0000 (17:51 -0800)]
Fix seeking behavior
A recent fix to seeking behavior injected a couple of issues that need
to be addressed:
- the start time should be updated when seeking so that future calculations
that depend on it (such as the next animation frame) will use the updated
start time based on this seek request. This allows, for example, seeking
into a running animator so that that animator will update its current fraction
to the new seeked value.
- calling reverse() on an unstarted animation would incorrectly set the initial
frame of the animation to the end value for one frame before the reverse animation
actually began.
Issue #
18567716 No icons in folders in battery saving mode
Issue #
18511989 Search bar flashes when icon is picked up and dropped
Change-Id: Ie30b7e797468c6ccb3d17d4fb3aba6b9849436b0
Joe Fernandez [Thu, 4 Dec 2014 23:07:04 +0000 (23:07 +0000)]
am
ae80fd42: am
f5aa6752: am
709df4fa: Merge "docs: Fixes for App Indexing training class" into lmp-docs
* commit '
ae80fd42a4371e28f6d89dc0f480f35da9dc57ce':
docs: Fixes for App Indexing training class
Luan Nguyen [Thu, 4 Dec 2014 23:06:53 +0000 (23:06 +0000)]
am
0e597e92: am
9b5de582: am
daab7426: Merge "docs: Update MessageAPI notes to mention the unreliable transmission nature." into lmp-docs
* commit '
0e597e922464545e6257027f71b575bd73adf4f4':
docs: Update MessageAPI notes to mention the unreliable transmission nature.
smain@google.com [Thu, 4 Dec 2014 23:05:47 +0000 (23:05 +0000)]
am
cc10c02b: am
6c59abc9: am
9db37264: Merge "update L Preview message and disallow crawling /preview" into lmp-docs
* commit '
cc10c02b10ce6d0be223c4409cb6aab98c5b8858':
update L Preview message and disallow crawling /preview
Filip Gruszczynski [Thu, 4 Dec 2014 23:02:18 +0000 (15:02 -0800)]
Private Window flag to disable touch events in WallpaperService.
Change-Id: I18b46340f89cbea0b6daeb1efe9c31656f4e1a5d
Zhentao Sun [Thu, 4 Dec 2014 22:52:49 +0000 (22:52 +0000)]
Merge "Fixed a leak in GeofenceHardwareImpl.java." into lmp-mr1-dev
Raph Levien [Thu, 4 Dec 2014 22:42:38 +0000 (14:42 -0800)]
Change Linkify leniency to VALID
The linkify logic used POSSIBLE as its leniency setting, which resulted
in false positives such as 4-digit years being interpreted as phone
numbers. Changing to VALID as per recommendation of libphonenumber
people, which fixes this problem.
Bug:
18489494
Change-Id: I77d330285de46de2fdda22daed41392106ec6ddd
Raph Levien [Thu, 4 Dec 2014 22:33:07 +0000 (22:33 +0000)]
Merge "Fix off-by-one error in computeEllipsis" into lmp-mr1-dev
Raph Levien [Thu, 4 Dec 2014 21:26:07 +0000 (13:26 -0800)]
Fix off-by-one error in computeEllipsis
In the Truncate.MIDDLE case, when the line is less than half the layout
width, the computeEllipsis logic could go past the left edge of the
string. This patch fixes the off-by-one and avoids the resulting index
out of bounds crash, and also changes the behavior so that when
ellipsizing at the middle, the string to the end of the paragraph is
taken into account.
Bug:
18508627
Change-Id: I24be09c23a5aa158791a9717419307613b8a22e8
Jason Monk [Thu, 4 Dec 2014 22:31:56 +0000 (22:31 +0000)]
Merge "Make CarrierText handle multi-sim" into lmp-mr1-dev
Jason Monk [Tue, 2 Dec 2014 21:43:17 +0000 (16:43 -0500)]
Make CarrierText handle multi-sim
To do this need to handle the subscription id that comes with all
spn broadcasts and concatenate properly as needed.
Bug:
18223317
Change-Id: I2a1cde0a4bf2f50082288cc5cdeb968fa9aa7dd0
Nancy Chen [Wed, 3 Dec 2014 23:18:08 +0000 (15:18 -0800)]
Use TelecomManager to call TelephonyManager#getVoicemailNumber (1/2)
Since we don't want the phone app to call TelephonyManager methods
directly, create a method in TelecomManager to mimic the behavior. The
reason we don't return the voicemail number directly is because once
TelecomManager becomes public, we don't want any old app to be able to
get the SIM's voicemail number.
Bug:
18233678
Change-Id: I620af409788aea7b58169b72a563baeed8115080
Nick Chalko [Thu, 4 Dec 2014 22:05:30 +0000 (14:05 -0800)]
docs: Fix typo, use --> user
Change-Id: Idfadf09b6c1711f6294e155176a2a713f8a8f616
Alan Viverette [Thu, 4 Dec 2014 21:59:40 +0000 (21:59 +0000)]
Merge "Update locally cached drawables when constant state changes" into lmp-mr1-dev
Wale Ogunwale [Thu, 4 Dec 2014 21:58:49 +0000 (21:58 +0000)]
Merge "Add support from restoring recent's backup." into lmp-mr1-dev
Dianne Hackborn [Thu, 4 Dec 2014 21:58:46 +0000 (13:58 -0800)]
Fix issue #
18593636: Turn on "kill important processes that...
...have ballooned" for all devices
Actually, this was supposed to be on for all devices, but it was no
longer being run due to changes in the idle maintenance code in L.
So now we run it again. And moved the idle maintenance window to 3am.
Change-Id: I8e90723e1431b82896d261cf90f8bf84f43b0bf2
Craig Mautner [Thu, 4 Dec 2014 21:54:52 +0000 (21:54 +0000)]
Merge "bug fix possible NPE while startProcessLocked()" into lmp-mr1-dev
Craig Mautner [Thu, 4 Dec 2014 21:53:38 +0000 (21:53 +0000)]
Merge "[ActivityManager] Invalidate last screenshot when activity relaunched" into lmp-mr1-dev
Craig Mautner [Thu, 4 Dec 2014 21:51:55 +0000 (21:51 +0000)]
Merge "[ActivityManager] Fix race condition in pss collection" into lmp-mr1-dev
Craig Mautner [Thu, 4 Dec 2014 21:50:45 +0000 (21:50 +0000)]
Merge "ANR caused by incorrect cleanup in BroadcastQueue." into lmp-mr1-dev
Craig Mautner [Thu, 4 Dec 2014 21:50:14 +0000 (21:50 +0000)]
Merge "Avoid system server crash due to package removed" into lmp-mr1-dev
Craig Mautner [Thu, 4 Dec 2014 21:45:19 +0000 (21:45 +0000)]
Merge "Reset killedByAm flag at attachApplicationLocked" into lmp-mr1-dev
Craig Mautner [Thu, 4 Dec 2014 21:44:33 +0000 (21:44 +0000)]
Merge "[ActivityManager] Fix NPE when start activity" into lmp-mr1-dev
louis_chang [Tue, 2 Dec 2014 04:38:05 +0000 (12:38 +0800)]
[ActivityManager] Invalidate last screenshot when activity relaunched
Symptom:
The task thumbnail is not updated when activity relaunched.
Reproduce Steps:
1. Put device in portrait
2. Launch Calculator
3. Launch Recent App (the Calculator's screenshot is correct)
4. Rotate device to landscape
5. Click Calculator in Recent App to return to Calculator (Calculator has relaunched to landsacpe ui)
6. Launch Recent App again (the Calculator's screenshot is not updated)
Change-Id: I92e951ea2ee215c52ca6e50cf6f9e02deb787bce
younghwan1.kim [Tue, 2 Dec 2014 04:04:40 +0000 (13:04 +0900)]
bug fix possible NPE while startProcessLocked()
In case, process doesn't create well while startingProcessLocked().
There is possibility to make NPE.
Setting app's crash handler needs to be assigned after null check routine.
Change-Id: I67fb6427f72d93f79fed36eb44c47d37eafdac31
louis_chang [Tue, 2 Dec 2014 04:57:39 +0000 (12:57 +0800)]
[ActivityManager] Fix race condition in pss collection
Symptom:
There has a race condition that two threads are accessing
the mPendingPssProcesses simultaneously. One of the thread
is collecting the process pss by looping the mPendingPssProcesses.
The other thread is requesting to collect pss of all processes,
which clears mPendingPssProcesses and adding processes back.
Solution:
Avoid race condition by adding synchornized protection.
Change-Id: Ifb090eda9c4a1b8e3fd980fe0171e9dd77773b46
Kazuki Nakayama [Thu, 29 May 2014 07:05:34 +0000 (16:05 +0900)]
Reset killedByAm flag at attachApplicationLocked
Cherry picked from aosp.
Fixes bug
18593309.
ActivityManager reuses a process record object that killed
by him under some situation. That reused process record inherits
a killedByAm flag unexpectedly.
The killedByAm flag must be reset otherwise ActivityManager can't
judge the process can be killed or not.
Change-Id: If95137d91939cc44882ad2813131bcde0edd0c1b
Joe Fernandez [Thu, 4 Dec 2014 21:06:21 +0000 (21:06 +0000)]
am
f5aa6752: am
709df4fa: Merge "docs: Fixes for App Indexing training class" into lmp-docs
* commit '
f5aa675294ef1c622ec369450e2b0bbaa839db6d':
docs: Fixes for App Indexing training class
louis_chang [Fri, 1 Aug 2014 02:09:08 +0000 (10:09 +0800)]
[ActivityManager] Fix NPE when start activity
Cherry picked from aosp.
Fixes bug
18593457.
Symptom:
NPE occurs in line 1184 (resultStack.sendActivityResultLocked)
because resultStack is null.
Root cause:
When starting activity with FLAG_ACTIVITY_FORWARD_RESULT flag,
the resultRecord could be updated, but the resultStack is not
updated as well. In that case, the resultStack is still be
null. The exception will occurs if the activity is not
granted to launch due to permission denied.
Solution:
Update resultStack when resultRecord updates.
Change-Id: I91634e4f713c2e8dbd1a71f358a8fd9beed83ec7
Joe Fernandez [Thu, 4 Dec 2014 21:00:30 +0000 (21:00 +0000)]
am
709df4fa: Merge "docs: Fixes for App Indexing training class" into lmp-docs
* commit '
709df4fa2600d1d2ee2f686097e1c92b52b58d19':
docs: Fixes for App Indexing training class
Alan Viverette [Thu, 4 Dec 2014 20:54:46 +0000 (12:54 -0800)]
Update locally cached drawables when constant state changes
Previously we were failing to update references to drawables that had
been pulled from constant state, so we were drawing the wrong ones.
Also fixes button Z translation on press, which was WAY too high.
BUG:
18542282
Change-Id: Ifde7d64e31d31737854cfcbe75777e5b07a06e3a
Joe Fernandez [Thu, 4 Dec 2014 20:50:47 +0000 (20:50 +0000)]
Merge "docs: Fixes for App Indexing training class" into lmp-docs
Joe Fernandez [Tue, 2 Dec 2014 05:22:53 +0000 (21:22 -0800)]
docs: Fixes for App Indexing training class
b/
18244320
b/
17982146
Change-Id: Ic095c3c73d09fa2d7f3c08fa47763fa8589683af
Wale Ogunwale [Wed, 3 Dec 2014 19:38:33 +0000 (11:38 -0800)]
Add support from restoring recent's backup.
Bug:
15986349
Change-Id: I899f81d317fcd5277a75db7ba50ecca14112df26
David Friedman [Thu, 4 Dec 2014 20:31:32 +0000 (20:31 +0000)]
am
47eddc7c: am
bf6a4bfb: am
6e043e0c: Merge "Change notes for NDK r10d, to publish to DAC" into lmp-docs
* commit '
47eddc7cc98cb99b5820c07109337a1f5ea48c77':
Change notes for NDK r10d, to publish to DAC
Geoff Mendal [Thu, 4 Dec 2014 20:31:29 +0000 (20:31 +0000)]
am
9ece2e96: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
9ece2e960046a169ac30c4b23119052793c76d98':
Import translations. DO NOT MERGE
David Friedman [Thu, 4 Dec 2014 20:30:57 +0000 (20:30 +0000)]
am
2d2e7bf3: am
ed839a76: am
795db65e: Merge "Fixes a typo, in which the word "give" is repeated. Bug
18553334" into lmp-docs
* commit '
2d2e7bf33f2e443a650fa29ee646055b231ea380':
Fixes a typo, in which the word "give" is repeated. Bug
18553334
Svetoslav [Thu, 4 Dec 2014 20:29:56 +0000 (20:29 +0000)]
Merge "Notify accessibility for window changes after an app animation end." into lmp-mr1-dev
Guobin Zhang [Fri, 7 Mar 2014 09:47:10 +0000 (17:47 +0800)]
ANR caused by incorrect cleanup in BroadcastQueue.
Pulled from aosp.
Fixes bug
18593454.
Two broadcasts could be sent to the same app simultaneously:
one foreground, one background. For example, LOCALE_CHANGED
and PACKAGE_CHANGED are delievered to com.android.vending
at the same time.
1. AMS started new vending process to handle LOCALE_CHANGED.
And set app.curReceiver = LOCALE_CHANGED.
2. Before LOCALE_CHANGED is handled by vending process,
PACKAGE_CHANGED was delievered to vending process too.
AMS set app.curReceiver = PACKAGE_CHANGED. Bad!
3. Vending process finished handling LOCALE_CHANGED.
AMS clear app.curReceiver = NULL. Bad!
And Vending process killed itself without handling
PACKAGE_CHANGED.
4. AMS known vending process has died, but didn't know that
BgBroadcastQueue was still waiting for finish message
for PACKAGE_CHANGED.
At last, BgBroadcastQueue reported ANR for PACKAGE_CHANGED.
This patch adds protection before clearing app.curReceiver,
only set to NULL if the finishing receiver = app.curReceiver
So handleAppDied would know that PACKAGE_CHANGED was not
finished yet, it will abort the broadcast and continue.
Change-Id: Ic4f31b35e21823d4a3c27712391ecbede213a494
Signed-off-by: Guobin Zhang <guobin.zhang@intel.com>
Justin Harrison [Thu, 4 Dec 2014 20:05:39 +0000 (20:05 +0000)]
Merge "Revert "Revert "Improve fling physics for recents""" into lmp-mr1-dev
Justin Harrison [Thu, 4 Dec 2014 20:05:21 +0000 (20:05 +0000)]
Revert "Revert "Improve fling physics for recents""
This is now BC-triaged, so reverting the revert.
This reverts commit
3f7dac5a1ccf5d464070c1a067d1d50741bdbd0e.
Change-Id: Iae9ffc74a44918a83d9cd4dfb7011810c770e135
Craig Mautner [Thu, 4 Dec 2014 19:46:18 +0000 (19:46 +0000)]
Merge "Prevent ANR when broadcast receiver is killed" into lmp-mr1-dev
Paul Jensen [Thu, 4 Dec 2014 19:27:50 +0000 (19:27 +0000)]
Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev
Luan Nguyen [Thu, 4 Dec 2014 19:02:50 +0000 (19:02 +0000)]
am
9b5de582: am
daab7426: Merge "docs: Update MessageAPI notes to mention the unreliable transmission nature." into lmp-docs
* commit '
9b5de582058d73fbc363028eae061979b6a093ee':
docs: Update MessageAPI notes to mention the unreliable transmission nature.
Kenji Sugimoto [Thu, 17 Jul 2014 05:50:41 +0000 (14:50 +0900)]
Prevent ANR when broadcast receiver is killed
Cherry-picked from aosp
Fixes bug
18613138.
If the process of a BroacastReceiver is dying at the same time
as the system is trying to send an ordered broadcast to the
receiver, the system will try to start the process again. The
BroadcastQueue will store the BroadcastRecord in mPendingBroadcast
to be able to handle it again when the process is awake. A
timeout Message is posted to the handler of the BroadcastQueue.
As part of the shutdown sequence skipCurrentReceiver is called for
the ProcessRecord. This will check if there is a curReceiver set
for the application and make sure to finish the receiver.
Each of the foreground and background BroadcastQueues have their
own handler for managing broadcast timeouts. If the wrong
BroadcastQueue finishes the receiver, the pending timeout Message
will never be cancelled, leading to an ANR report for a receiver
that has already been finished.
Change-Id: I960c0d8f1a8b739b54a8f09f496b32a3498b9e9a
Luan Nguyen [Thu, 4 Dec 2014 18:55:08 +0000 (18:55 +0000)]
am
daab7426: Merge "docs: Update MessageAPI notes to mention the unreliable transmission nature." into lmp-docs
* commit '
daab7426b254b57820f3e556960e9f5b20ba5bc6':
docs: Update MessageAPI notes to mention the unreliable transmission nature.
Luan Nguyen [Thu, 4 Dec 2014 18:50:42 +0000 (18:50 +0000)]
Merge "docs: Update MessageAPI notes to mention the unreliable transmission nature." into lmp-docs
Prerepa Viswanadham [Thu, 4 Dec 2014 18:12:55 +0000 (10:12 -0800)]
Fix BT crash due to unset value for BluetoothGattDescriptor from API user
Validate writeDescriptor and writeCharacteristic methods at API invocation
for non null initialisation.
Bug
18395071
Change-Id: I411a57b77981310d8db1f98c67e03b4327c93339
Adam Lesinski [Thu, 4 Dec 2014 18:24:39 +0000 (18:24 +0000)]
Merge "AAPT: Move private attrs to new type for framework" into lmp-mr1-dev
Christoph Studer [Thu, 4 Dec 2014 18:09:10 +0000 (18:09 +0000)]
Merge "Log the state of the notification shade" into lmp-mr1-dev
Christoph Studer [Thu, 4 Dec 2014 18:08:33 +0000 (18:08 +0000)]
Merge "NoMan: Update effect suppressor on listener remove" into lmp-mr1-dev
Chris Wren [Thu, 4 Dec 2014 18:02:52 +0000 (18:02 +0000)]
Merge "Track active notifications by key, not by reference." into lmp-mr1-dev
Lajos Molnar [Thu, 4 Dec 2014 17:50:06 +0000 (09:50 -0800)]
media: allow full range of Vorbis sampling rates
Bug:
18615604
Change-Id: I51f0c5c81145b94626f2b7e4505b905b63a572bf
RoboErik [Thu, 4 Dec 2014 17:46:39 +0000 (17:46 +0000)]
Merge "Tweak the behavior of the MediaSessionStack" into lmp-mr1-dev
Justin Harrison [Thu, 4 Dec 2014 17:37:53 +0000 (17:37 +0000)]
Merge "Revert "Improve fling physics for recents"" into lmp-mr1-dev
Justin Harrison [Thu, 4 Dec 2014 17:37:24 +0000 (17:37 +0000)]
Revert "Improve fling physics for recents"
This reverts commit
00d947bda0b9a2ea133dfd7b0e445245a0e2c23c.
Change-Id: I3d6696227a381d232baed8fdbcbe34d3c4976ebe
smain@google.com [Thu, 4 Dec 2014 15:20:34 +0000 (15:20 +0000)]
am
6c59abc9: am
9db37264: Merge "update L Preview message and disallow crawling /preview" into lmp-docs
* commit '
6c59abc947491d8c291413eb29e1669f61059c7a':
update L Preview message and disallow crawling /preview
Jorim Jaggi [Thu, 4 Dec 2014 15:18:15 +0000 (15:18 +0000)]
Merge "Improve fling physics for recents" into lmp-mr1-dev
Jorim Jaggi [Thu, 4 Dec 2014 15:17:00 +0000 (15:17 +0000)]
Merge "Fix rounded corners in bottom QS panel." into lmp-mr1-dev
smain@google.com [Thu, 4 Dec 2014 15:12:48 +0000 (15:12 +0000)]
am
9db37264: Merge "update L Preview message and disallow crawling /preview" into lmp-docs
* commit '
9db37264719d022391b67ad39cc274cd9d05bc40':
update L Preview message and disallow crawling /preview
David Friedman [Thu, 4 Dec 2014 13:35:40 +0000 (13:35 +0000)]
am
bf6a4bfb: am
6e043e0c: Merge "Change notes for NDK r10d, to publish to DAC" into lmp-docs
* commit '
bf6a4bfb20f3b8db3cf4c47fa887d7cc603ce5c4':
Change notes for NDK r10d, to publish to DAC
Derek Sollenberger [Thu, 4 Dec 2014 13:04:48 +0000 (13:04 +0000)]
Merge "Update AndroidPixelRef to prevent VM from cleaning up memory prematurely." into lmp-mr1-dev
Christoph Studer [Thu, 4 Dec 2014 12:12:22 +0000 (12:12 +0000)]
Merge "RankingHelper: Remove STOPSHIP" into lmp-mr1-dev
Deepanshu Gupta [Thu, 4 Dec 2014 07:00:19 +0000 (07:00 +0000)]
am
6cbef4bd: am
03af0c42: Merge "Ensure that RandomAccessFile is not leaked." into lmp-dev
* commit '
6cbef4bd3e1f16647ab01dc29df9a357d54a85de':
Ensure that RandomAccessFile is not leaked.
Deepanshu Gupta [Thu, 4 Dec 2014 07:00:14 +0000 (07:00 +0000)]
am
4628d51a: am
141c7614: Merge "Fix AnalogClock rendering" into lmp-dev
* commit '
4628d51a0d01641ca7fe2cf8403ad551ea6f50ce':
Fix AnalogClock rendering
Deepanshu Gupta [Thu, 4 Dec 2014 06:58:20 +0000 (06:58 +0000)]
Merge "resolved conflicts for merge of
fb30a783 to lmp-mr1-dev" into lmp-mr1-dev
Jinsuk Kim [Thu, 4 Dec 2014 06:39:57 +0000 (06:39 +0000)]
Merge "CEC: Generate hotplug events upon adding listener" into lmp-mr1-dev
Vinit Deshpande [Thu, 4 Dec 2014 06:21:28 +0000 (06:21 +0000)]
Merge "Remove notification for SoftAP turned on" into lmp-mr1-dev
Jinsuk Kim [Thu, 4 Dec 2014 02:05:09 +0000 (11:05 +0900)]
CEC: Generate hotplug events upon adding listener
CEC HAL does not report initial connection state of the HDMI port
but does it only when the state is updated. For the listeners which
want to get the initial state of the ports, this CL generates
hotplug event per each port when a new listener is added.
Bug:
18488079
Change-Id: I6915a96e3c14ee0db1bfb6912ab77d3ea1bd2f07
Yuncheol Heo [Wed, 3 Dec 2014 13:29:45 +0000 (22:29 +0900)]
CEC: Introduce the retry for commands on the new device discovery.
- ChromeCast needs some preparation time to work properly after it
reboots.
Bug:
18489614
Change-Id: I74ff05820c3bda84e2f042fb91bf510ab9444e55
Geoff Mendal [Thu, 4 Dec 2014 05:32:18 +0000 (05:32 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Thu, 4 Dec 2014 05:06:11 +0000 (05:06 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Deepanshu Gupta [Thu, 4 Dec 2014 05:00:40 +0000 (10:30 +0530)]
resolved conflicts for merge of
fb30a783 to lmp-mr1-dev
Change-Id: I91fdb76c748b97376d6469c8d1198a15c4395463
Geoff Mendal [Thu, 4 Dec 2014 04:54:51 +0000 (04:54 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Thu, 4 Dec 2014 04:33:25 +0000 (04:33 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Erik Kline [Thu, 4 Dec 2014 03:13:54 +0000 (03:13 +0000)]
Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev
John Spurlock [Thu, 4 Dec 2014 03:03:20 +0000 (03:03 +0000)]
Merge "Doze: Don't block pickup pulses on a proximity check." into lmp-mr1-dev
Pavel Zhamaitsiak [Thu, 4 Dec 2014 01:59:43 +0000 (01:59 +0000)]
Merge "IMS Call End Cause Additions" into lmp-mr1-dev
duho.ro [Wed, 12 Nov 2014 04:06:27 +0000 (13:06 +0900)]
UICC : discard language setting of SIM
Some carrier card has incorrect language file.
This is to disable loading language setting from SIM card.
Bug:
18095177
Bug:
18108786
Change-Id: I40881fc64fea52480c968a18440740af9c8cff57