Jungshik Jang
11eb372a90
am 7403d656: am 324b1f8a: Merge "CEC: Send <Give System Audio Mode> regardless of TV\'s setting." into lmp-mr1-dev
...
automerge: a981a71
* commit 'a981a715c429bcdfe648e05d6de088ad5aa31419':
CEC: Send <Give System Audio Mode> regardless of TV's setting.
2014-11-10 01:25:52 +00:00
Jungshik Jang
a981a715c4
am 7403d656: am 324b1f8a: Merge "CEC: Send <Give System Audio Mode> regardless of TV\'s setting." into lmp-mr1-dev
...
* commit '7403d656470dd7b4875e006410e257795a09d183':
CEC: Send <Give System Audio Mode> regardless of TV's setting.
2014-11-10 01:10:31 +00:00
Jungshik Jang
324b1f8a47
Merge "CEC: Send <Give System Audio Mode> regardless of TV's setting." into lmp-mr1-dev
2014-11-10 00:54:33 +00:00
Mike Lockwood
7c2b60ed37
am d73463c6: Merge "Add dumpsys support for bluetooth" into lmp-mr1-dev automerge: 95c05a5
...
automerge: 5a880e72
* commit '5a880e72024882d1a4ad5a04a4cb4a6aa5e6d426':
Add dumpsys support for bluetooth
2014-11-08 03:09:13 +00:00
Adam Lesinski
a4d5542ae4
am b94de814: Merge "UsageStatsService: Update file index to prevent double checkin" into lmp-mr1-dev automerge: 96f635e
...
automerge: 4f163bd
* commit '4f163bd8acc1b00394c1fae7c2ffc42fc5ca2790':
UsageStatsService: Update file index to prevent double checkin
2014-11-08 03:07:57 +00:00
Amith Yamasani
78673cc6aa
am 1aeab291: Merge "Inform PendingIntent sender if broadcast was not queued." into lmp-mr1-dev automerge: 395b519
...
automerge: 2a21f24
* commit '2a21f247885780d90873bb25aa7c7f710e4bffcc':
Inform PendingIntent sender if broadcast was not queued.
2014-11-08 03:05:45 +00:00
Mike Lockwood
5a880e7202
am d73463c6: Merge "Add dumpsys support for bluetooth" into lmp-mr1-dev automerge: 95c05a5
...
* commit 'd73463c61a9ada1083155214be15ba3c653b73f5':
Add dumpsys support for bluetooth
2014-11-08 03:00:35 +00:00
Adam Lesinski
4f163bd8ac
am b94de814: Merge "UsageStatsService: Update file index to prevent double checkin" into lmp-mr1-dev automerge: 96f635e
...
* commit 'b94de814479749818e30dace03c70697485c7809':
UsageStatsService: Update file index to prevent double checkin
2014-11-08 03:00:29 +00:00
Amith Yamasani
2a21f24788
am 1aeab291: Merge "Inform PendingIntent sender if broadcast was not queued." into lmp-mr1-dev automerge: 395b519
...
* commit '1aeab291764b77ffa2c6e6eb28441beec6fa041c':
Inform PendingIntent sender if broadcast was not queued.
2014-11-08 02:59:55 +00:00
Mike Lockwood
95c05a590f
Merge "Add dumpsys support for bluetooth" into lmp-mr1-dev
2014-11-08 02:15:28 +00:00
Adam Lesinski
96f635ed5b
Merge "UsageStatsService: Update file index to prevent double checkin" into lmp-mr1-dev
2014-11-08 02:07:45 +00:00
Amith Yamasani
395b519f4b
Merge "Inform PendingIntent sender if broadcast was not queued." into lmp-mr1-dev
2014-11-08 01:39:12 +00:00
Adam Lesinski
0fb25fae8f
UsageStatsService: Update file index to prevent double checkin
...
We seem to have renamed a file as checked-in twice, which means
we checked it in twice and created a malformed name with the suffix
"-c-c" instead of the correct suffix "-c".
Bug:18280677
Change-Id: Ie3164010898a333e5d9b97151d285ea376de799e
2014-11-07 17:36:27 -08:00
Amith Yamasani
83b6ef01a0
Inform PendingIntent sender if broadcast was not queued.
...
If the broadcast could not be queued due to a stopped user, the
party trying to send a PendingIntent should be notified right away.
Otherwise, for instance, AlarmManager could be waiting forever to
be called back after the broadcast is delivered.
This is a potential fix for:
Bug: 18290018
Change-Id: I07c0751e80f11e69dfa2be5c96a033aecb298b81
2014-11-07 15:34:04 -08:00
Christopher Tate
be98cdce1c
am b63fd56b: am e5205d1a: am 48a7c3b5: Merge "Enable runtime turndown of backup/restore services" into lmp-mr1-dev
...
* commit 'b63fd56b396dab177959ee33fe41ff40ff5c3c7f':
Enable runtime turndown of backup/restore services
2014-11-07 23:13:29 +00:00
Christopher Tate
b63fd56b39
am e5205d1a: am 48a7c3b5: Merge "Enable runtime turndown of backup/restore services" into lmp-mr1-dev
...
* commit 'e5205d1ae491a97197d12fc2bc5afe1a449cf75d':
Enable runtime turndown of backup/restore services
2014-11-07 23:08:49 +00:00
Christopher Tate
48a7c3b522
Merge "Enable runtime turndown of backup/restore services" into lmp-mr1-dev
2014-11-07 23:00:24 +00:00
Jason Monk
2a472ffa7a
am aac9f433: am 68d0089c: am 975590f2: Merge "Material design for screen pinning cling" into lmp-mr1-dev
...
* commit 'aac9f433ff3db2b39dc143956e4ab9aabf76e3e9':
Material design for screen pinning cling
2014-11-07 19:34:12 +00:00
Jason Monk
0aee5a9b80
am 81f5fa74: am 88aad1af: am 2f04d16f: Merge "Plumbing for screen pinning request from sysui" into lmp-mr1-dev
...
* commit '81f5fa7422c8c531702427f508df3c069baf8c7e':
Plumbing for screen pinning request from sysui
2014-11-07 19:33:30 +00:00
Jason Monk
aac9f433ff
am 68d0089c: am 975590f2: Merge "Material design for screen pinning cling" into lmp-mr1-dev
...
* commit '68d0089c66b67b2df2b4c3d9f9e68bbcae637d79':
Material design for screen pinning cling
2014-11-07 19:12:03 +00:00
Jason Monk
81f5fa7422
am 88aad1af: am 2f04d16f: Merge "Plumbing for screen pinning request from sysui" into lmp-mr1-dev
...
* commit '88aad1af7f6f3f775d10b8ea5e61225c0c89d3d1':
Plumbing for screen pinning request from sysui
2014-11-07 19:07:15 +00:00
Jason Monk
975590f229
Merge "Material design for screen pinning cling" into lmp-mr1-dev
2014-11-07 18:59:25 +00:00
Jason Monk
2f04d16f16
Merge "Plumbing for screen pinning request from sysui" into lmp-mr1-dev
2014-11-07 18:53:54 +00:00
Christopher Tate
bbe23b31dc
Enable runtime turndown of backup/restore services
...
The heavy implementation of the backup manager service is now sitting
behind a lightweight trampoline that actually provides the binder
call interface. The indirection allows us now to tear down the
implementation on the fly without breaking callers who have cached
binder references to the backup services: these callers will simply
see their future invocations failing benignly.
In addition there is now an API for suitably privileged callers such
as device policy management to effect this turndown.
Finally, there is now a static system property, "ro.backup.disable",
that a product can use to outright remove backup/restore operation
from the system's operation. The public APIs will continue to be
safely usable on such products but no data will be moved to or
from the device.
Bug 17367491
Change-Id: I8108e386ef3b5c967938fae483366d6978fe4e04
2014-11-07 18:40:47 +00:00
Jason Monk
18f99d9134
Material design for screen pinning cling
...
Switching from a dialog to a cling-like view to be more material.
Also moving it into SysUI as it highlights the buttons in nav bar.
This will be triggered directly from recents, but from apps it
will be triggered by the PhoneStatusBar. In the case that apps
trigger the request, there will be a 'no thanks' button so that
users can refuse.
Bug: 16957435
Change-Id: Ie880f82c66f4b2be98283ed3fa789703c4bd7ed5
2014-11-07 11:09:19 -05:00
Winson Chung
c5f9ec3e27
am 675a0b6b: am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev
...
* commit '675a0b6bc9ee2f2e80f28381c0f34d98e0447ad6':
Adding bounce animation for affiliated tasks. (Bug 16656169)
2014-11-07 04:17:02 +00:00
Brian Carlstrom
900b2d913c
am bb7388a8: am 14531903: am f4d2c8ee: Merge "Restore mLazyDexOpt behavior for eng builds" into lmp-mr1-dev
...
* commit 'bb7388a86e8e9782cf8caf4d176cd2b8d16d752b':
Restore mLazyDexOpt behavior for eng builds
2014-11-07 04:15:39 +00:00
destradaa
22db164727
am 031550a3: am 9ed36c42: Merge "Add support for GPS measurement/navigation message capabilities. b/16727892 b/16815124" into lmp-mr1-dev automerge: 992b9aa
...
* commit '031550a31e56bb8300ba9d1225004581ec156777':
Add support for GPS measurement/navigation message capabilities. b/16727892 b/16815124
2014-11-07 03:56:10 +00:00
Craig Mautner
f2859b514f
am 587cdde2: am bc1fdca0: Add logging for failure to finish. automerge: a11bb74
...
* commit '587cdde2e2bf7e833e433c1edd6e8078832e327c':
Add logging for failure to finish.
2014-11-07 03:56:05 +00:00
Sreeram Ramachandran
88d4f29654
am 64105c8f: am 2663cdcb: Merge "Send broadcasts when VPNs come and go." into lmp-mr1-dev automerge: 0cb1bc4
...
* commit '64105c8f3a075bbdb1b552ed5b9942961b8499ad':
Send broadcasts when VPNs come and go.
2014-11-07 03:56:00 +00:00
destradaa
6550fa7452
am 91c962ad: am a084d357: Merge "Fix reference leak in GPS measurement JNI layer. b/16727892 b/17075171" into lmp-mr1-dev automerge: c3e5599
...
* commit '91c962ad9c90e79b8dbbf7aaaaf2d827adf7cc16':
Fix reference leak in GPS measurement JNI layer. b/16727892 b/17075171
2014-11-07 03:55:54 +00:00
Jeremy Joslin
e4fb9419d8
am 93f515f9: am 91fff05b: Merge "Implemented requestNetwork with a PendingIntent." into lmp-mr1-dev automerge: 1a2b99e
...
* commit '93f515f99030f3c8d54005cc0cf600ca06e215b1':
Implemented requestNetwork with a PendingIntent.
2014-11-07 03:55:38 +00:00
Craig Mautner
0fecad76d1
am 22254f50: am 39f6be12: Merge "More fixes for keyguard animations." into lmp-mr1-dev automerge: 7b1b0f6
...
* commit '22254f504f10a0190792060de2820ccf7323a84f':
More fixes for keyguard animations.
2014-11-07 03:55:29 +00:00
Jungshik Jang
7fb8e7f4ff
CEC: Send <Give System Audio Mode> regardless of TV's setting.
...
When TV is brought back out of standby, it should send <Give System Audio Mode>
to audio receiver so that TV recovers system audio mode.
Current implementation sends <Give System Audio Mode> only when setting is "ON".
In order to fix this, this change sends <Give System Audio Mode>
regardless of TV's setting and update system audio mode according to
response of <Give System Audio Mode>.
Bug: 18267467
Change-Id: I2c3c05347c6f2a7a3a5e3772e4e26c77156eb740
2014-11-07 11:11:58 +09:00
Winson Chung
675a0b6bc9
am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev
...
* commit '513aa79290dd17400c4cce82d1d801c05ff3776f':
Adding bounce animation for affiliated tasks. (Bug 16656169)
2014-11-07 01:45:11 +00:00
Winson Chung
3ed9f2f903
Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev
2014-11-07 01:30:20 +00:00
Brian Carlstrom
bb7388a86e
am 14531903: am f4d2c8ee: Merge "Restore mLazyDexOpt behavior for eng builds" into lmp-mr1-dev
...
* commit '1453190388e789e27c775ebb8e96267e3c3c6eca':
Restore mLazyDexOpt behavior for eng builds
2014-11-07 00:46:16 +00:00
Brian Carlstrom
f4d2c8eebd
Merge "Restore mLazyDexOpt behavior for eng builds" into lmp-mr1-dev
2014-11-07 00:39:09 +00:00
Andres Morales
7c71141505
am 98b07343: am 3e5d6aa0: am f33d9db4: am b1477d11: Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev
...
* commit '98b073434d0c55788c3e27887675c795c46c8b9d':
[DO NOT MERGE] Increase min free levels for cached processes on 64bit
2014-11-07 00:24:59 +00:00
destradaa
031550a31e
am 9ed36c42: Merge "Add support for GPS measurement/navigation message capabilities. b/16727892 b/16815124" into lmp-mr1-dev automerge: 992b9aa
...
* commit '9ed36c42d8c3731b8ca631292881110eb8897cec':
Add support for GPS measurement/navigation message capabilities. b/16727892 b/16815124
2014-11-07 00:07:30 +00:00
Craig Mautner
587cdde2e2
am bc1fdca0: Add logging for failure to finish. automerge: a11bb74
...
* commit 'bc1fdca0bbc5a2295e15c0d5a84912cc325dd0ac':
Add logging for failure to finish.
2014-11-07 00:07:24 +00:00
Sreeram Ramachandran
64105c8f3a
am 2663cdcb: Merge "Send broadcasts when VPNs come and go." into lmp-mr1-dev automerge: 0cb1bc4
...
* commit '2663cdcb39cbb319c5d778b3bc0a6ebc6c6ea1b4':
Send broadcasts when VPNs come and go.
2014-11-07 00:07:19 +00:00
destradaa
91c962ad9c
am a084d357: Merge "Fix reference leak in GPS measurement JNI layer. b/16727892 b/17075171" into lmp-mr1-dev automerge: c3e5599
...
* commit 'a084d357d3fd0a5696998e786aeb10ff394f24d5':
Fix reference leak in GPS measurement JNI layer. b/16727892 b/17075171
2014-11-07 00:07:12 +00:00
Jeremy Joslin
93f515f990
am 91fff05b: Merge "Implemented requestNetwork with a PendingIntent." into lmp-mr1-dev automerge: 1a2b99e
...
* commit '91fff05ba93b6c78e1744159f97bc0448e22115c':
Implemented requestNetwork with a PendingIntent.
2014-11-07 00:06:54 +00:00
Craig Mautner
22254f504f
am 39f6be12: Merge "More fixes for keyguard animations." into lmp-mr1-dev automerge: 7b1b0f6
...
* commit '39f6be121627303d9c485832c4b730867151d9f8':
More fixes for keyguard animations.
2014-11-07 00:06:42 +00:00
Andres Morales
3e5d6aa04b
am f33d9db4: am b1477d11: Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev
...
* commit 'f33d9db43a30299e2dfd3585c0964af953766a09':
[DO NOT MERGE] Increase min free levels for cached processes on 64bit
2014-11-07 00:06:25 +00:00
Paul Lawrence
c7579101c9
am 202ab298: am b282cc30: am 3bde026a: am afb6b50e: Merge "DO NOT MERGE: Don\'t log passwords returned from vdc" into lmp-dev
...
* commit '202ab2986c2ab61ea32845ea94af6e329c1fd83c':
DO NOT MERGE: Don't log passwords returned from vdc
2014-11-07 00:06:25 +00:00
Andres Morales
f33d9db43a
am b1477d11: Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev
...
* commit 'b1477d11ca873db761dd378a5fea93b26d695f78':
[DO NOT MERGE] Increase min free levels for cached processes on 64bit
2014-11-06 23:57:25 +00:00
Andres Morales
b1477d11ca
Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev
2014-11-06 23:51:00 +00:00
Andres Morales
423c44dc91
[DO NOT MERGE] Increase min free levels for cached processes on 64bit
...
Requires less memory pressure to start killing cached
processes.
Change-Id: Ia02f5aee115535badc900330b9361f0099203e4f
2014-11-06 15:44:02 -08:00