OSDN Git Service
Andres Morales [Thu, 8 Jan 2015 16:21:37 +0000 (16:21 +0000)]
Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev automerge:
d656955 automerge:
c9a7694
automerge:
7628fac
* commit '
7628fac99fb23b71ae418b9833bc7e5d534c1e9a':
Wipe FRP partition if OEM unlock enabled
Andres Morales [Thu, 8 Jan 2015 16:15:47 +0000 (16:15 +0000)]
Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev automerge:
d656955
automerge:
c9a7694
* commit '
c9a76941ecca457e6a17b06f557c24e18e3bdafa':
Wipe FRP partition if OEM unlock enabled
Andres Morales [Thu, 8 Jan 2015 16:13:17 +0000 (16:13 +0000)]
Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev
automerge:
d656955
* commit '
d656955efdd2e148d9390125b899e8fe2b677abd':
Wipe FRP partition if OEM unlock enabled
Andres Morales [Thu, 8 Jan 2015 16:10:25 +0000 (16:10 +0000)]
Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev
Marcin Kosiba [Thu, 8 Jan 2015 12:45:40 +0000 (12:45 +0000)]
Un-break the WebView build.
This renames methods that have been renamed in
Ib9d403156c1fc4fb04f65f3c126d1277a44b3740 back to their original
names.
Change-Id: I07b2fb94b21c42c36958855d19d996f96b0ce5c4
Vladimir Marko [Thu, 8 Jan 2015 10:52:37 +0000 (10:52 +0000)]
resolved conflicts for merge of
36401a36 to lmp-mr1-dev-plus-aosp
automerge:
371d77e
* commit '
371d77ecf684163b3bd1061e00191980f1fc90a1':
Check for OOM in BitmapFactory's getMimeTypeString().
Vladimir Marko [Thu, 8 Jan 2015 10:46:53 +0000 (10:46 +0000)]
resolved conflicts for merge of
36401a36 to lmp-mr1-dev-plus-aosp
Change-Id: Ic280478a5979a47cac148c0eac9bdfd20ec0e6e7
Vladimir Marko [Thu, 8 Jan 2015 10:28:27 +0000 (10:28 +0000)]
am
e9a935f6: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()." into lmp-mr1-dev
* commit '
e9a935f6b60f5abaf9cdbd45f18d2e8c0a9c6bd8':
Check for OOM in BitmapFactory's getMimeTypeString().
Vladimir Marko [Thu, 8 Jan 2015 10:24:48 +0000 (10:24 +0000)]
Merge "Check for OOM in BitmapFactory's getMimeTypeString()." into lmp-mr1-dev
Bryce Lee [Thu, 8 Jan 2015 04:42:40 +0000 (04:42 +0000)]
Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."" into lmp-mr1-dev automerge:
c010c96 automerge:
d1646dc
automerge:
1cad889
* commit '
1cad8899be13e5eaefbc8300a832a826870ea7ca':
Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."
Bryce Lee [Thu, 8 Jan 2015 04:38:01 +0000 (04:38 +0000)]
Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."" into lmp-mr1-dev automerge:
c010c96
automerge:
d1646dc
* commit '
d1646dcfd1d40bdc094f34e05c1359cfc3fa7c65':
Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."
Bryce Lee [Thu, 8 Jan 2015 04:32:40 +0000 (04:32 +0000)]
Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."" into lmp-mr1-dev
automerge:
c010c96
* commit '
c010c96fdf143b242c9795a71b231ccb4658b625':
Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."
Bryce Lee [Thu, 8 Jan 2015 04:30:12 +0000 (04:30 +0000)]
Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."" into lmp-mr1-dev
Jinsuk Kim [Thu, 8 Jan 2015 04:21:26 +0000 (04:21 +0000)]
am
62a1e753: Merge "CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput" into lmp-mr1-dev automerge:
09d4e03
automerge:
764a1ba
* commit '
764a1ba86d3160e4b1e10aa1ac7477539321b42b':
CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput
Jinsuk Kim [Thu, 8 Jan 2015 04:18:01 +0000 (04:18 +0000)]
am
62a1e753: Merge "CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput" into lmp-mr1-dev automerge:
09d4e03
* commit '
62a1e753b1f73f575c978a377efdc531e7a86b8f':
CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput
Jinsuk Kim [Thu, 8 Jan 2015 04:11:47 +0000 (04:11 +0000)]
Merge "CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput" into lmp-mr1-dev
automerge:
09d4e03
* commit '
09d4e03736caa1baf07256fc5cd6d61b264021a7':
CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput
Jinsuk Kim [Thu, 8 Jan 2015 04:08:52 +0000 (04:08 +0000)]
Merge "CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput" into lmp-mr1-dev
Jinsuk Kim [Wed, 7 Jan 2015 07:45:14 +0000 (16:45 +0900)]
CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput
Resolves a timing-related bug that fails to process the command
<Active Source> at TV boot up. Checks if TV input required for
the command is ready to accept the request. If not, makes sure
the command is buffered, and processed later when the input is
ready.
Bug:
18896770
Change-Id: Id17e5e8468519b17daf61c962dd718ccc56fb0ea
Bryce Lee [Thu, 8 Jan 2015 02:32:08 +0000 (02:32 +0000)]
Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."
This reverts commit
fabbdf7204474a9f789ce441219b3b9f3df66bb8.
Causes NPE on devices without telephony (Android Wear for example)
Bug:
18922524
Change-Id: I3be4187a20da11fd5a302dd88e808a68cd7e5737
Deepanshu Gupta [Thu, 8 Jan 2015 01:54:13 +0000 (01:54 +0000)]
am
321bf433: am
2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-dev automerge:
03c822a
* commit '
321bf43315ace2f091a54d514dd56902990bec7a':
Replace java.util.LinkedHashMap.eldest()
Deepanshu Gupta [Thu, 8 Jan 2015 01:54:08 +0000 (01:54 +0000)]
am
f0da92bf: am
169c11dd: Merge "Add missing DateFormat method." into lmp-mr1-dev automerge:
33b2de7
* commit '
f0da92bfda9a7b393cac87436173c1284c7d48be':
Add missing DateFormat method.
Deepanshu Gupta [Thu, 8 Jan 2015 01:53:56 +0000 (01:53 +0000)]
am
f45420d0: am
565b6b41: Merge "Update platform.dir search in tests." into lmp-mr1-dev automerge:
7e39385
* commit '
f45420d0bd912de3da9506bbae12a0e4b789bd84':
Update platform.dir search in tests.
Deepanshu Gupta [Thu, 8 Jan 2015 01:49:23 +0000 (01:49 +0000)]
am
2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-dev
automerge:
03c822a
* commit '
03c822aa585c319fb9cd05f392d8518501cc4f79':
Replace java.util.LinkedHashMap.eldest()
Deepanshu Gupta [Thu, 8 Jan 2015 01:47:52 +0000 (01:47 +0000)]
am
169c11dd: Merge "Add missing DateFormat method." into lmp-mr1-dev
automerge:
33b2de7
* commit '
33b2de7f34180983fe596ff9faa6955b032fa157':
Add missing DateFormat method.
Deepanshu Gupta [Thu, 8 Jan 2015 01:46:46 +0000 (01:46 +0000)]
am
565b6b41: Merge "Update platform.dir search in tests." into lmp-mr1-dev
automerge:
7e39385
* commit '
7e393853656387757da2531d4e504d7cf32e738e':
Update platform.dir search in tests.
Deepanshu Gupta [Thu, 8 Jan 2015 01:38:44 +0000 (01:38 +0000)]
am
2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-dev
* commit '
2d14feb4c7185008111f3a6340f114a4c891e01c':
Replace java.util.LinkedHashMap.eldest()
Deepanshu Gupta [Thu, 8 Jan 2015 01:31:54 +0000 (01:31 +0000)]
Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-dev
Deepanshu Gupta [Thu, 8 Jan 2015 01:23:35 +0000 (01:23 +0000)]
am
169c11dd: Merge "Add missing DateFormat method." into lmp-mr1-dev
* commit '
169c11dd39ec44364168785a7a83fb747e893c9a':
Add missing DateFormat method.
Deepanshu Gupta [Thu, 8 Jan 2015 01:23:30 +0000 (01:23 +0000)]
am
565b6b41: Merge "Update platform.dir search in tests." into lmp-mr1-dev
* commit '
565b6b415a18ee0b99af8cb693b980e57136282b':
Update platform.dir search in tests.
Deepanshu Gupta [Thu, 8 Jan 2015 01:17:31 +0000 (01:17 +0000)]
Merge "Add missing DateFormat method." into lmp-mr1-dev
Deepanshu Gupta [Thu, 8 Jan 2015 01:17:22 +0000 (01:17 +0000)]
Merge "Update platform.dir search in tests." into lmp-mr1-dev
Jeff Sharkey [Thu, 8 Jan 2015 01:11:05 +0000 (01:11 +0000)]
am
bcba2182: Merge "check ntpserver as empty string instead of null" automerge:
dbcb4a1 automerge:
387da77
* commit '
bcba21827c836e8941719b432fbf11d1bb8e8639':
check ntpserver as empty string instead of null
Jeff Sharkey [Thu, 8 Jan 2015 01:03:49 +0000 (01:03 +0000)]
Merge "check ntpserver as empty string instead of null" automerge:
dbcb4a1
automerge:
387da77
* commit '
387da7769757ab6368acb2a0000cd8a85d3e55d8':
check ntpserver as empty string instead of null
Jeff Sharkey [Thu, 8 Jan 2015 00:59:56 +0000 (00:59 +0000)]
Merge "check ntpserver as empty string instead of null"
automerge:
dbcb4a1
* commit '
dbcb4a16d4c91d960359fbdb8c6f1d72a4daca9e':
check ntpserver as empty string instead of null
Jeff Sharkey [Thu, 8 Jan 2015 00:57:42 +0000 (00:57 +0000)]
Merge "check ntpserver as empty string instead of null"
Alan Viverette [Thu, 8 Jan 2015 00:37:16 +0000 (00:37 +0000)]
Merge "Add popup window accessors for anchor overlap, gravity, window"
Young-Ho Cha [Wed, 7 Jan 2015 02:24:35 +0000 (11:24 +0900)]
check ntpserver as empty string instead of null
mServer cannot set null, because string from resource always returns
non-null charsequence
Change-Id: I8d6a6fdbc34267ee361e7bd20719887268161870
Signed-off-by: Young-Ho Cha <ganadist@gmail.com>
Deepanshu Gupta [Thu, 8 Jan 2015 00:25:59 +0000 (16:25 -0800)]
Replace java.util.LinkedHashMap.eldest()
Provide an alternate implementation for the above method and replace the
calls to it, since the method is not available on host VM.
Change-Id: I329d86b457d1859b137da8fb2790ddd7f8efa788
Alan Viverette [Thu, 8 Jan 2015 00:32:04 +0000 (00:32 +0000)]
Merge "API for tinting TextView compound drawables"
Deepanshu Gupta [Thu, 8 Jan 2015 00:16:32 +0000 (00:16 +0000)]
am
5df729ad: am
a98a9b30: am
d8e99c58: am
3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev automerge:
0b1188e
* commit '
5df729ad09b85cb68bdf37d58c5d429c2c8663a4':
Fix tests on jenkins, take 2.
Joe Fernandez [Thu, 8 Jan 2015 00:16:28 +0000 (00:16 +0000)]
am
04b30fa0: am
ec5f5934: am
97b7b863: am
d385640f: am
491a8257: docs: Update Dashboard for January 2015 automerge:
0e13957
* commit '
04b30fa00b5ae9c05c307dbfa2ba7d8028402999':
docs: Update Dashboard for January 2015
Alan Viverette [Thu, 8 Jan 2015 00:16:20 +0000 (16:16 -0800)]
API for tinting TextView compound drawables
BUG:
18762354
Change-Id: Iba6fab4f63a5d26cb27606d25a1fd0a1f47afa57
Andy Hung [Thu, 8 Jan 2015 00:11:32 +0000 (00:11 +0000)]
Merge "Use channelCountFromOutChannelMask in AudioTrack"
Jinsong Mu [Thu, 8 Jan 2015 00:08:20 +0000 (00:08 +0000)]
Merge "Make talkback or other accessibility services updateable from playstore only when it's been enabled. The idea is to set accessibility services package status to disabled_until_used by default. Change the status to enabled once user turn the service on."
Alan Viverette [Thu, 8 Jan 2015 00:07:23 +0000 (00:07 +0000)]
Merge "Fix accessibility delegation"
Alan Viverette [Thu, 8 Jan 2015 00:05:02 +0000 (16:05 -0800)]
Fix accessibility delegation
Ensures that delegate code is run last. Previously, calling the super
method from an accessibility delegate set on a widget would only run
code in the widget's parent. Next, the delegate code would run. Finally,
the widget's code would run. As a result, the widget code would override
any data supplied by the delegate.
By moving all overridden code to internal methods, we ensure that the
call chain for super includes the widget's parent code followed by the
widget's code. The delegate code will always run last.
BUG:
17641433
Change-Id: Ib9d403156c1fc4fb04f65f3c126d1277a44b3740
Deepanshu Gupta [Thu, 8 Jan 2015 00:03:58 +0000 (00:03 +0000)]
am
a98a9b30: am
d8e99c58: am
3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev automerge:
0b1188e
* commit '
a98a9b30bea74478b9d1b3f16e3713f5c864e648':
Fix tests on jenkins, take 2.
Joe Fernandez [Thu, 8 Jan 2015 00:03:52 +0000 (00:03 +0000)]
am
ec5f5934: am
97b7b863: am
d385640f: am
491a8257: docs: Update Dashboard for January 2015 automerge:
0e13957
* commit '
ec5f5934153557e85c1a001e713b963b79d18388':
docs: Update Dashboard for January 2015
Deepanshu Gupta [Wed, 7 Jan 2015 23:57:59 +0000 (23:57 +0000)]
am
d8e99c58: am
3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev automerge:
0b1188e
* commit '
d8e99c5861b09de8f709c9284240e2c3115507bb':
Fix tests on jenkins, take 2.
Joe Fernandez [Wed, 7 Jan 2015 23:57:54 +0000 (23:57 +0000)]
am
97b7b863: am
d385640f: am
491a8257: docs: Update Dashboard for January 2015 automerge:
0e13957
* commit '
97b7b8637bc50cbcd9ad9a63fcb34355439b0701':
docs: Update Dashboard for January 2015
Deepanshu Gupta [Wed, 7 Jan 2015 23:53:09 +0000 (23:53 +0000)]
am
3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev
automerge:
0b1188e
* commit '
0b1188e3c1ff6c814dc64c51c83b19afa36d8ce9':
Fix tests on jenkins, take 2.
Alan Viverette [Wed, 7 Jan 2015 23:51:54 +0000 (15:51 -0800)]
Add popup window accessors for anchor overlap, gravity, window
Cleans up comments and some code in PopupWindow.
BUG:
18245054
Change-Id: I2111d0c194ee1a39aaa721083041fc139efcf630
Joe Fernandez [Wed, 7 Jan 2015 23:51:33 +0000 (23:51 +0000)]
am
d385640f: am
491a8257: docs: Update Dashboard for January 2015
automerge:
0e13957
* commit '
0e13957a4deab3a90492d9ae2f6d35d3b5c1773e':
docs: Update Dashboard for January 2015
Christopher Tate [Wed, 7 Jan 2015 23:32:28 +0000 (23:32 +0000)]
am
413ec4a6: am
bee49807: Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev
automerge:
e045188
* commit '
e04518866e0c75e6c96976aca77f24dc22b51416':
Support single-package backup rejection by the transport
Christopher Tate [Wed, 7 Jan 2015 23:30:34 +0000 (23:30 +0000)]
am
413ec4a6: am
bee49807: Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev
* commit '
413ec4a6573ffa88bf02a796eb8c9dc7dfa839ca':
Support single-package backup rejection by the transport
Alan Viverette [Wed, 7 Jan 2015 23:26:18 +0000 (23:26 +0000)]
Merge "Fix date picker color handling, expose StateSet utils in more places"
Christopher Tate [Wed, 7 Jan 2015 23:23:14 +0000 (23:23 +0000)]
am
bee49807: Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev
* commit '
bee49807dde9f19d5163e87b71fe17392bfe857c':
Support single-package backup rejection by the transport
Christopher Tate [Wed, 7 Jan 2015 23:19:49 +0000 (23:19 +0000)]
Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev
Andres Morales [Wed, 7 Jan 2015 22:24:57 +0000 (14:24 -0800)]
Wipe FRP partition if OEM unlock enabled
Not all devices invoke recovery on every userdata wipe,
so we can't rely on code in the
recovery OS to do this. This results in fastboot -w
not properly wiping the FRP partition. This patch
fixes the issue by having the framework level service
check the OEM unlock enabled bit, and wiping the partition
if it is set.
Bug:
18644051
Change-Id: Id97a29916fe39561700912a920c5741109842bdb
Wale Ogunwale [Wed, 7 Jan 2015 22:32:55 +0000 (22:32 +0000)]
Merge "Add RecentTasks class to house recent tasks functionality."
Andreas Gampe [Wed, 7 Jan 2015 22:17:25 +0000 (22:17 +0000)]
am
ec64c0b6: am
022b1ba1: Merge "Core/jni: Disallow relocation for decryption"
automerge:
555ea65
* commit '
555ea653bae019379eb8d1aa70dfcb86789c19d3':
Core/jni: Disallow relocation for decryption
Andreas Gampe [Wed, 7 Jan 2015 22:16:11 +0000 (22:16 +0000)]
am
ec64c0b6: am
022b1ba1: Merge "Core/jni: Disallow relocation for decryption"
* commit '
ec64c0b6e639b743398fb543218100fdaf9a7f69':
Core/jni: Disallow relocation for decryption
Wale Ogunwale [Tue, 9 Dec 2014 17:32:50 +0000 (09:32 -0800)]
Add RecentTasks class to house recent tasks functionality.
Cleaned-up ActivityManagerService a little by moving recent
tasks functionality to new class RecentTasks.
Bug:
18556524
Change-Id: I4c877c9695b63d7fdb1b6b7addb737fd663e86c7
RoboErik [Wed, 7 Jan 2015 22:10:57 +0000 (22:10 +0000)]
am
13d1057d: am
2610d712: Don\'t unmute when trying to show volume UI. DO NOT MERGE
automerge:
516fa49 -s ours
* commit '
516fa49183b8fbd010e619dea4d041b24d784503':
Don't unmute when trying to show volume UI. DO NOT MERGE
Andreas Gampe [Wed, 7 Jan 2015 22:09:11 +0000 (22:09 +0000)]
am
022b1ba1: Merge "Core/jni: Disallow relocation for decryption"
* commit '
022b1ba188b249b0f17d1b5e8ab3badbc529f98e':
Core/jni: Disallow relocation for decryption
RoboErik [Wed, 7 Jan 2015 22:06:47 +0000 (22:06 +0000)]
am
13d1057d: am
2610d712: Don\'t unmute when trying to show volume UI. DO NOT MERGE
* commit '
13d1057d5b3ca46d00d627a89f0d37836b9db8fd':
Don't unmute when trying to show volume UI. DO NOT MERGE
Andreas Gampe [Wed, 7 Jan 2015 22:05:11 +0000 (22:05 +0000)]
Merge "Core/jni: Disallow relocation for decryption"
Jinsong Mu [Wed, 7 Jan 2015 22:00:50 +0000 (14:00 -0800)]
Make talkback or other accessibility services updateable from playstore
only when it's been enabled. The idea is to set accessibility services package
status to disabled_until_used by default. Change the status to enabled once user
turn the service on.
It is first part of CL in framework, that returns installed accessibilityServices
even they been set disabled_until_used
Second part of CL will be in Settings, where we read/write package status
based on the service has been turn on or off.
The similiar logic has been used for preventing never used IME from auto updated
b/
18205549
Change-Id: I1a9cba0221e3de0499ba5ac91ca382696bcb7043
RoboErik [Wed, 7 Jan 2015 22:00:28 +0000 (22:00 +0000)]
am
2610d712: Don\'t unmute when trying to show volume UI. DO NOT MERGE
* commit '
2610d71251e3e376e2514f20986c81e5d55f1b55':
Don't unmute when trying to show volume UI. DO NOT MERGE
Alan Viverette [Wed, 7 Jan 2015 21:57:12 +0000 (13:57 -0800)]
Fix date picker color handling, expose StateSet utils in more places
Enabled use of color selectors for the day number text, which lets us
use the "activated" text color and push the selection background
opacity up to 100%. Also ensures the selector circle stays within the
bounds of the selected day.
BUG:
18864682
Change-Id: Ia36ea748f83e13683a1de8ac1a259d353578d61a
Fyodor Kupolov [Wed, 7 Jan 2015 21:31:30 +0000 (21:31 +0000)]
Merge "Sync accounts of a specified user only"
neo.chae [Wed, 7 Jan 2015 06:32:15 +0000 (15:32 +0900)]
Core/jni: Disallow relocation for decryption
When decrypting a device, a tmpfs is temporarily mounted as /data,
the size of which is usually small. When the zygote, system server
and necessary apps are brought up, they will be compiled into the
tmpfs.
If the system image contains prebuilts, they will be relocated instead
of compiled. This is unnecessary. In this special situation it is
acceptable to run out of the prebuilt oat files without relocation,
which can save space in the tmpfs.
This patch ensures that the boot image is not being relocated.
Change-Id: I42bfb7e3039574b7e4f2772e0d395f093d59ed1b
Signed-off-by: Hyangseok Chae <neo.chae@lge.com>
Deepanshu Gupta [Wed, 7 Jan 2015 20:26:31 +0000 (12:26 -0800)]
Add missing DateFormat method.
Change-Id: Ia03023e65ef4a7ec90b61f1f538cbe74868c63c5
Deepanshu Gupta [Wed, 7 Jan 2015 20:21:59 +0000 (12:21 -0800)]
Update platform.dir search in tests.
The tests search for a built sdk using some heuristics. The default path
of the built sdk has changed now, and this updates the search
accordingly.
Change-Id: I36d465d8c5f6cfd971bbdf95878fb144de233c6c
RoboErik [Wed, 7 Jan 2015 19:10:23 +0000 (11:10 -0800)]
Don't unmute when trying to show volume UI. DO NOT MERGE
When a MediaSession is active the adjust volume event to show UI was
causing the stream to be unmuted. Since this happens after every mute
event you were unable to mute while a session was active. This change
doesn't unmute for events that just show the UI.
bug:
18844550
Change-Id: Ic8b0f1ab1354646724ead4572a973c302c275eab
RoboErik [Wed, 7 Jan 2015 19:10:23 +0000 (11:10 -0800)]
Don't unmute when trying to show volume UI
When a MediaSession is active the adjust volume event to show UI was
causing the stream to be unmuted. Since this happens after every mute
event you were unable to mute while a session was active. This change
doesn't unmute for events that just show the UI.
bug:
18844550
Change-Id: Ic8b0f1ab1354646724ead4572a973c302c275eab
Deepanshu Gupta [Wed, 7 Jan 2015 19:46:03 +0000 (19:46 +0000)]
am
3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev
* commit '
3bd33f1d9e8af826fa95095ca391d40f6c75ca2a':
Fix tests on jenkins, take 2.
Deepanshu Gupta [Wed, 7 Jan 2015 19:29:39 +0000 (19:29 +0000)]
Merge "Fix tests on jenkins, take 2." into lmp-dev
Deepanshu Gupta [Wed, 7 Jan 2015 19:22:22 +0000 (11:22 -0800)]
Fix tests on jenkins, take 2.
Change-Id: I67386c34a7abd7c3afdf9f0768f36f4786399be0
Geoff Mendal [Wed, 7 Jan 2015 18:46:13 +0000 (18:46 +0000)]
Merge "Import translations. DO NOT MERGE"
Narayan Kamath [Wed, 7 Jan 2015 18:44:33 +0000 (18:44 +0000)]
am
e02fe5af: am
c46d2a2d: Merge "camera2: Clarify the documentation on the ImageReader usecase"
automerge:
6ed2140
* commit '
6ed21403e7dea44a70ae06da64229a557ee19c98':
camera2: Clarify the documentation on the ImageReader usecase
Narayan Kamath [Wed, 7 Jan 2015 18:42:57 +0000 (18:42 +0000)]
am
e02fe5af: am
c46d2a2d: Merge "camera2: Clarify the documentation on the ImageReader usecase"
* commit '
e02fe5afac0bc792559a4c424ffc8391c501abfe':
camera2: Clarify the documentation on the ImageReader usecase
Geoff Mendal [Wed, 7 Jan 2015 18:41:50 +0000 (10:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie481d48e65a34dfff6e669a0bd97a8e2ccd8801a
Auto-generated-cl: translation import
Narayan Kamath [Wed, 7 Jan 2015 18:36:05 +0000 (18:36 +0000)]
am
c46d2a2d: Merge "camera2: Clarify the documentation on the ImageReader usecase"
* commit '
c46d2a2dca55da9ee54da5ba6b7473ee3addd51a':
camera2: Clarify the documentation on the ImageReader usecase
Narayan Kamath [Wed, 7 Jan 2015 18:31:55 +0000 (18:31 +0000)]
Merge "camera2: Clarify the documentation on the ImageReader usecase"
Wale Ogunwale [Wed, 7 Jan 2015 18:17:18 +0000 (18:17 +0000)]
am
6763058f: am
f61bc8a2: Merge "Bring task with root activity to front when launching from recents." into lmp-mr1-dev
automerge:
df3d130
* commit '
df3d1307d5141c394b0eb521d6beb7f262fb3e3f':
Bring task with root activity to front when launching from recents.
Wale Ogunwale [Wed, 7 Jan 2015 18:14:39 +0000 (18:14 +0000)]
am
6763058f: am
f61bc8a2: Merge "Bring task with root activity to front when launching from recents." into lmp-mr1-dev
* commit '
6763058fe74c31bd44b8c94e2911c72e9db68e97':
Bring task with root activity to front when launching from recents.
Martin Storsjo [Wed, 19 Nov 2014 09:58:03 +0000 (11:58 +0200)]
camera2: Clarify the documentation on the ImageReader usecase
Uncompressed JPEG data is an oxymoron. Also mention the other
usecases for ImageReader.
Change-Id: I75261baf162a58c415705db99afa474c3826f900
Wale Ogunwale [Wed, 7 Jan 2015 18:08:55 +0000 (18:08 +0000)]
am
f61bc8a2: Merge "Bring task with root activity to front when launching from recents." into lmp-mr1-dev
* commit '
f61bc8a2624bc70c903238229a62abc3351ed620':
Bring task with root activity to front when launching from recents.
Wale Ogunwale [Wed, 7 Jan 2015 18:02:40 +0000 (18:02 +0000)]
Merge "Bring task with root activity to front when launching from recents." into lmp-mr1-dev
Geoff Mendal [Wed, 7 Jan 2015 17:09:53 +0000 (17:09 +0000)]
am
56db8228: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
automerge:
ec08d88 -s ours
* commit '
ec08d889a1b6e35742bcc1bac72fd7a40b5b2a4e':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Jan 2015 17:07:26 +0000 (17:07 +0000)]
am
56db8228: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
56db82282d701c81cedb38b246716e406c2158ff':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Jan 2015 17:02:34 +0000 (17:02 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 7 Jan 2015 16:58:27 +0000 (08:58 -0800)]
Import translations. DO NOT MERGE
Change-Id: I91b076501cd9499fcd60f899fe7299735bf8c140
Auto-generated-cl: translation import
John Spurlock [Wed, 7 Jan 2015 16:45:22 +0000 (16:45 +0000)]
Merge "Remove two obsolete status bar icons."
John Spurlock [Wed, 7 Jan 2015 16:22:01 +0000 (11:22 -0500)]
Remove two obsolete status bar icons.
Change-Id: I054d90044b889642ae3ba7affce71304ca44ca8d
Jason Monk [Wed, 7 Jan 2015 16:32:51 +0000 (16:32 +0000)]
Merge "SysUI: Separate SignalControllers into separate files"
Jason Monk [Wed, 7 Jan 2015 15:55:58 +0000 (10:55 -0500)]
SysUI: Separate SignalControllers into separate files
and remove the TODO that says to do it.
Change-Id: I54ac3f27f9246aea87d21f2a1da6608ae675aae6
John Spurlock [Wed, 7 Jan 2015 16:14:08 +0000 (16:14 +0000)]
Merge "Remove detestable tab characters."
Tom Hudson [Wed, 7 Jan 2015 16:13:40 +0000 (16:13 +0000)]
Merge "Merge frameworks/base changes from master-skia to "