179697 Commits

Author SHA1 Message Date
Christopher Tate
81a2b3f82a 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
2015-01-07 23:32:28 +00:00
Christopher Tate
e04518866e 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
2015-01-07 23:30:34 +00:00
Alan Viverette
ed26b9cfe8 Merge "Fix date picker color handling, expose StateSet utils in more places" 2015-01-07 23:26:19 +00:00
Christopher Tate
413ec4a657 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
2015-01-07 23:23:14 +00:00
Christopher Tate
bee49807dd Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev 2015-01-07 23:19:50 +00:00
Andres Morales
1ce7d179bf 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
2015-01-07 14:46:19 -08:00
Wale Ogunwale
e98b86e50f Merge "Add RecentTasks class to house recent tasks functionality." 2015-01-07 22:32:57 +00:00
Andreas Gampe
93e6d6ede4 am ec64c0b6: am 022b1ba1: Merge "Core/jni: Disallow relocation for decryption"
automerge: 555ea65

* commit '555ea653bae019379eb8d1aa70dfcb86789c19d3':
  Core/jni: Disallow relocation for decryption
2015-01-07 22:17:25 +00:00
Andreas Gampe
555ea653ba am ec64c0b6: am 022b1ba1: Merge "Core/jni: Disallow relocation for decryption"
* commit 'ec64c0b6e639b743398fb543218100fdaf9a7f69':
  Core/jni: Disallow relocation for decryption
2015-01-07 22:16:11 +00:00
Wale Ogunwale
c82f2f5f9c 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
2015-01-07 14:13:42 -08:00
RoboErik
942b3ba71b 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
2015-01-07 22:10:57 +00:00
Andreas Gampe
ec64c0b6e6 am 022b1ba1: Merge "Core/jni: Disallow relocation for decryption"
* commit '022b1ba188b249b0f17d1b5e8ab3badbc529f98e':
  Core/jni: Disallow relocation for decryption
2015-01-07 22:09:11 +00:00
RoboErik
516fa49183 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
2015-01-07 22:06:47 +00:00
Andreas Gampe
022b1ba188 Merge "Core/jni: Disallow relocation for decryption" 2015-01-07 22:05:12 +00:00
Dianne Hackborn
ab2df067fc Add new debug feature to track associations between processes. Also
add some debugging for spurious service ANRs.

Bug: 18201239
Change-Id: Icd43f35c696d71453e1d4deea855984b2d14b347
2015-01-07 14:01:13 -08:00
Jinsong Mu
e5aa1f5258 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
2015-01-07 14:00:50 -08:00
RoboErik
13d1057d5b 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
2015-01-07 22:00:28 +00:00
Alan Viverette
c5b95c20b6 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
2015-01-07 13:57:12 -08:00
Fyodor Kupolov
a72151b54b Merge "Sync accounts of a specified user only" 2015-01-07 21:31:33 +00:00
neo.chae
155118fee8 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>
2015-01-07 13:28:36 -08:00
Deepanshu Gupta
6aede34e24 Add missing DateFormat method.
Change-Id: Ia03023e65ef4a7ec90b61f1f538cbe74868c63c5
2015-01-07 12:26:31 -08:00
Deepanshu Gupta
0359b4b199 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
2015-01-07 12:21:59 -08:00
RoboErik
2610d71251 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
2015-01-07 20:13:31 +00:00
RoboErik
2b94d589c8 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
2015-01-07 12:11:09 -08:00
Deepanshu Gupta
0b1188e3c1 am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev
* commit '3bd33f1d9e8af826fa95095ca391d40f6c75ca2a':
  Fix tests on jenkins, take 2.
2015-01-07 19:46:03 +00:00
Deepanshu Gupta
3bd33f1d9e Merge "Fix tests on jenkins, take 2." into lmp-dev 2015-01-07 19:29:40 +00:00
Deepanshu Gupta
d657b14927 Fix tests on jenkins, take 2.
Change-Id: I67386c34a7abd7c3afdf9f0768f36f4786399be0
2015-01-07 11:22:22 -08:00
Geoff Mendal
382d6a9ed2 Merge "Import translations. DO NOT MERGE" 2015-01-07 18:46:15 +00:00
Narayan Kamath
fa8d52fef4 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
2015-01-07 18:44:33 +00:00
Narayan Kamath
6ed21403e7 am e02fe5af: am c46d2a2d: Merge "camera2: Clarify the documentation on the ImageReader usecase"
* commit 'e02fe5afac0bc792559a4c424ffc8391c501abfe':
  camera2: Clarify the documentation on the ImageReader usecase
2015-01-07 18:42:57 +00:00
Geoff Mendal
5d2a778149 Import translations. DO NOT MERGE
Change-Id: Ie481d48e65a34dfff6e669a0bd97a8e2ccd8801a
Auto-generated-cl: translation import
2015-01-07 10:41:50 -08:00
Narayan Kamath
e02fe5afac am c46d2a2d: Merge "camera2: Clarify the documentation on the ImageReader usecase"
* commit 'c46d2a2dca55da9ee54da5ba6b7473ee3addd51a':
  camera2: Clarify the documentation on the ImageReader usecase
2015-01-07 18:36:05 +00:00
Narayan Kamath
c46d2a2dca Merge "camera2: Clarify the documentation on the ImageReader usecase" 2015-01-07 18:31:56 +00:00
Wale Ogunwale
cab68c7894 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.
2015-01-07 18:17:18 +00:00
Wale Ogunwale
df3d1307d5 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.
2015-01-07 18:14:39 +00:00
RoboErik
7554d099e7 Reload MediaBrowser children on each call to subscribe
Only one callback can be set on a given media id on MediaBrowser. When you
try to subscribe with a new callback it replaces the old callback, but it
wasn't resending the child data for the id. This causes calling subscribe
again also cause the data to be reloaded and sent to the app again.

bug:18683452
Change-Id: I2d30dbbbfe07cb9a720fb6d65664c1c4c58cb637
2015-01-07 10:14:04 -08:00
Martin Storsjo
5c533e4fa0 camera2: Clarify the documentation on the ImageReader usecase
Uncompressed JPEG data is an oxymoron. Also mention the other
usecases for ImageReader.

Change-Id: I75261baf162a58c415705db99afa474c3826f900
2015-01-07 20:10:25 +02:00
Wale Ogunwale
6763058fe7 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.
2015-01-07 18:08:55 +00:00
Wale Ogunwale
f61bc8a262 Merge "Bring task with root activity to front when launching from recents." into lmp-mr1-dev 2015-01-07 18:02:41 +00:00
Geoff Mendal
308ad16e52 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
2015-01-07 17:09:53 +00:00
Geoff Mendal
ec08d889a1 am 56db8228: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '56db82282d701c81cedb38b246716e406c2158ff':
  Import translations. DO NOT MERGE
2015-01-07 17:07:26 +00:00
Geoff Mendal
56db82282d Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-01-07 17:02:35 +00:00
Geoff Mendal
fb7a35fc1f Import translations. DO NOT MERGE
Change-Id: I91b076501cd9499fcd60f899fe7299735bf8c140
Auto-generated-cl: translation import
2015-01-07 08:58:27 -08:00
John Spurlock
ee7712c0a9 Merge "Remove two obsolete status bar icons." 2015-01-07 16:45:23 +00:00
John Spurlock
f55bb573b2 Remove two obsolete status bar icons.
Change-Id: I054d90044b889642ae3ba7affce71304ca44ca8d
2015-01-07 11:36:32 -05:00
Jason Monk
5c530d8803 Merge "SysUI: Separate SignalControllers into separate files" 2015-01-07 16:32:52 +00:00
Jason Monk
da68f59628 SysUI: Separate SignalControllers into separate files
and remove the TODO that says to do it.

Change-Id: I54ac3f27f9246aea87d21f2a1da6608ae675aae6
2015-01-07 11:19:10 -05:00
John Spurlock
6746cf096b Merge "Remove detestable tab characters." 2015-01-07 16:14:09 +00:00
Tom Hudson
40a0709a56 Merge "Merge frameworks/base changes from master-skia to master." 2015-01-07 16:13:42 +00:00
John Spurlock
5b13e92271 Remove detestable tab characters.
Change-Id: Ia225720af80c07580e5a6ea5098b3d85da7a8dfe
2015-01-07 11:12:58 -05:00