OSDN Git Service
Jae Seo [Fri, 18 Jul 2014 03:35:24 +0000 (03:35 +0000)]
am
e2ef18ce: am
27d12ca6: TIF: Add buildInputId()
* commit '
e2ef18ce351e08becc100e2d76b6054a8d5ae96e':
TIF: Add buildInputId()
Jae Seo [Fri, 18 Jul 2014 03:30:41 +0000 (03:30 +0000)]
am
b719bf57: am
3245f3d7: Merge "TIF: Add TvParentalControlManager" into lmp-dev
* commit '
b719bf5720ea501fa6324d866e49e65b59b1a182':
TIF: Add TvParentalControlManager
Jae Seo [Fri, 18 Jul 2014 03:30:23 +0000 (03:30 +0000)]
am
27d12ca6: TIF: Add buildInputId()
* commit '
27d12ca6b4966d6dd520fb72fb0058619a87d448':
TIF: Add buildInputId()
Jae Seo [Fri, 18 Jul 2014 03:26:23 +0000 (03:26 +0000)]
am
3245f3d7: Merge "TIF: Add TvParentalControlManager" into lmp-dev
* commit '
3245f3d76cc92899091f113e701a32a7eb819591':
TIF: Add TvParentalControlManager
Jae Seo [Thu, 17 Jul 2014 23:53:13 +0000 (16:53 -0700)]
TIF: Add buildInputId()
A recent change mandated that we should provide "input ID" instead of
ComponentName when building URIs for channels/programs while there is no
direct way to get one to use with. This CL added a method to build an ID
from a ComponentName.
Change-Id: Ia7f868cf241bb44ca0d4f689dc15326ce6944468
Jeff Brown [Fri, 18 Jul 2014 03:16:58 +0000 (03:16 +0000)]
am
9560a079: am
ce75065c: Merge "Add glance sensor for doze mode." into lmp-dev
* commit '
9560a0797de1ce25952c9e8a0b124f49f8cf102e':
Add glance sensor for doze mode.
Tyler Gunn [Fri, 18 Jul 2014 03:09:55 +0000 (03:09 +0000)]
am
6edbc6ed: am
1a0365fd: Merge "Wiring video state through from Connection" into lmp-dev
* commit '
6edbc6edbfbec463efa2a364c1c8db32033b0765':
Wiring video state through from Connection
Sandeep Siddhartha [Fri, 18 Jul 2014 03:09:50 +0000 (03:09 +0000)]
am
207c076a: am
ad6bb11f: Merge "Test hotword flow" into lmp-dev
* commit '
207c076a52c74b28570ca6269e0b56bd8c886757':
Test hotword flow
Wonsik Kim [Fri, 18 Jul 2014 03:09:45 +0000 (03:09 +0000)]
am
719c0ebd: am
2a7c2e38: Merge "TIF: one-to-many relationship for TvInputService to TvInputInfo" into lmp-dev
* commit '
719c0ebdaceb1f714d66ff35c80cb3765f1caae9':
TIF: one-to-many relationship for TvInputService to TvInputInfo
RoboErik [Fri, 18 Jul 2014 03:09:35 +0000 (03:09 +0000)]
am
5f604ccf: am
2ca51276: Fix crash when calling MediaSession callback
* commit '
5f604ccf740919c294cad9403fd67c315eb20724':
Fix crash when calling MediaSession callback
Marcin Kosiba [Fri, 18 Jul 2014 03:09:31 +0000 (03:09 +0000)]
am
8ea71bf3: am
231d57e2: Add a WebView.zoomBy API.
* commit '
8ea71bf3c3e3face48160a1de82b9f2a71616c0b':
Add a WebView.zoomBy API.
Zhijun He [Fri, 18 Jul 2014 03:09:25 +0000 (03:09 +0000)]
am
fb29d478: am
93ecc474: Merge "Camera2: partialResultCount should be optional" into lmp-dev
* commit '
fb29d478e9407a6d0dc5b20bb7f2f23ecde4d3da':
Camera2: partialResultCount should be optional
Jeff Brown [Fri, 18 Jul 2014 03:08:27 +0000 (03:08 +0000)]
am
ce75065c: Merge "Add glance sensor for doze mode." into lmp-dev
* commit '
ce75065cff02b83f153306c2c2ec7e1cc3ef262b':
Add glance sensor for doze mode.
Jinsuk Kim [Fri, 18 Jul 2014 02:51:28 +0000 (02:51 +0000)]
am
eff7b1af: am
ba5ba7a2: Merge "Remove system audio output option for HdmiControlService" into lmp-dev
* commit '
eff7b1af6ab496ee64882ad21f1d58269fd37f4a':
Remove system audio output option for HdmiControlService
Craig Stout [Fri, 18 Jul 2014 02:51:12 +0000 (02:51 +0000)]
am
79de62b3: am
51ff3b68: Fix timepicker double done buttons.
* commit '
79de62b38cd94629aa09883120becec6faae2229':
Fix timepicker double done buttons.
Filip Gruszczynski [Fri, 18 Jul 2014 02:51:04 +0000 (02:51 +0000)]
am
c82b01a5: am
23c51de9: resolved conflicts for merge of
bbc49941 to lmp-dev
* commit '
c82b01a547fd94a9b042655712b82bd88e4d39af':
Only use bottom outset for main display.
John Spurlock [Fri, 18 Jul 2014 02:50:57 +0000 (02:50 +0000)]
am
b1bcf059: am
d92f55cb: Merge "Shade: Hide status icons, take 2." into lmp-dev
* commit '
b1bcf0591321914011ea0feed8e8496bbc945e05':
Shade: Hide status icons, take 2.
Christopher Tate [Fri, 18 Jul 2014 02:50:51 +0000 (02:50 +0000)]
am
85f64ae6: am
912793dc: Properly end full restore attempt if getNextFullRestoreDataChunk() fails
* commit '
85f64ae60cfe6bafd8ea2d60c45b18a531436344':
Properly end full restore attempt if getNextFullRestoreDataChunk() fails
Chris Craik [Fri, 18 Jul 2014 02:50:44 +0000 (02:50 +0000)]
am
19581d6b: am
a987914f: Merge "[HWUI]: fix residual line on FrameBuffer" into lmp-dev
* commit '
19581d6b307ef3e62d83bb890d6308a341799af4':
[HWUI]: fix residual line on FrameBuffer
Tyler Gunn [Fri, 18 Jul 2014 02:36:12 +0000 (02:36 +0000)]
am
1a0365fd: Merge "Wiring video state through from Connection" into lmp-dev
* commit '
1a0365fd820a6ab1b6a636c95cdabe55f965608a':
Wiring video state through from Connection
Sandeep Siddhartha [Fri, 18 Jul 2014 02:31:44 +0000 (02:31 +0000)]
am
ad6bb11f: Merge "Test hotword flow" into lmp-dev
* commit '
ad6bb11f0e683cf018ff34a6be50bb51a215cec3':
Test hotword flow
Wonsik Kim [Fri, 18 Jul 2014 02:23:52 +0000 (02:23 +0000)]
am
2a7c2e38: Merge "TIF: one-to-many relationship for TvInputService to TvInputInfo" into lmp-dev
* commit '
2a7c2e3895306024932a20e38dfff488436a486a':
TIF: one-to-many relationship for TvInputService to TvInputInfo
RoboErik [Fri, 18 Jul 2014 01:43:45 +0000 (01:43 +0000)]
am
2ca51276: Fix crash when calling MediaSession callback
* commit '
2ca512761bb16c2ed2136002d866cc2d7aaf79cb':
Fix crash when calling MediaSession callback
RoboErik [Fri, 18 Jul 2014 01:26:21 +0000 (18:26 -0700)]
Fix crash when calling MediaSession callback
bug:
16311395
Change-Id: Ice52d2da63933af881dd95fa8c6f59a6fe27e0df
Marcin Kosiba [Fri, 18 Jul 2014 01:23:51 +0000 (01:23 +0000)]
am
231d57e2: Add a WebView.zoomBy API.
* commit '
231d57e20d978fda6ace2457d9a5b19ee749f1cb':
Add a WebView.zoomBy API.
Marcin Kosiba [Tue, 15 Jul 2014 16:59:51 +0000 (17:59 +0100)]
Add a WebView.zoomBy API.
The WebView has zoomIn/zoomOut APIs which zoom in/out by a fixed
amount. This adds a more flexible API.
BUG:
13399510
Change-Id: Ia505048d5b1c48f9a3ff1c4ce7129ed2f55804f8
Zhijun He [Fri, 18 Jul 2014 01:06:12 +0000 (01:06 +0000)]
am
93ecc474: Merge "Camera2: partialResultCount should be optional" into lmp-dev
* commit '
93ecc474c3cedc6511bca900590637e68c86aa05':
Camera2: partialResultCount should be optional
Michael Wright [Fri, 18 Jul 2014 00:32:13 +0000 (00:32 +0000)]
am
e9f933cd: am
4d2ee15a: Merge "Add MediaProjection APIs." into lmp-dev
* commit '
e9f933cd6bdecb96212d5edf9ba54c7c12c46f03':
Add MediaProjection APIs.
Jinsuk Kim [Fri, 18 Jul 2014 00:28:16 +0000 (00:28 +0000)]
am
ba5ba7a2: Merge "Remove system audio output option for HdmiControlService" into lmp-dev
* commit '
ba5ba7a2408de8a3ac40d3bf0ed18141bee2fada':
Remove system audio output option for HdmiControlService
Ben Murdoch [Thu, 17 Jul 2014 23:48:26 +0000 (23:48 +0000)]
am
5ba41787: am
015ca040: Merge "Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast." into lmp-dev
* commit '
5ba4178783a48d3269e3404a1ba62263afd5932e':
Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast.
Ying Wang [Thu, 17 Jul 2014 23:48:21 +0000 (23:48 +0000)]
destradaa [Thu, 17 Jul 2014 23:48:08 +0000 (23:48 +0000)]
am
e2383800: am
607d3271: Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev
* commit '
e23838004e5db510c6e86919b2dcf16e67e3339b':
Fix exceptions in ActivityRecognition platform stack.
Craig Stout [Thu, 17 Jul 2014 23:47:57 +0000 (23:47 +0000)]
am
04e9457b: am
68e9eb34: Fix legacyMode for leanback timepicker
* commit '
04e9457bdd95a4e8c93538697c791f60b27cfc1c':
Fix legacyMode for leanback timepicker
Andres Morales [Thu, 17 Jul 2014 23:47:52 +0000 (23:47 +0000)]
am
77bf359b: am
e9f27df7: Permit settings to "wipe" the persistent partition
* commit '
77bf359b2d6b81fc18efe9ab888699df27ab81f9':
Permit settings to "wipe" the persistent partition
Zhijun He [Thu, 17 Jul 2014 23:47:45 +0000 (23:47 +0000)]
am
3bce0759: am
4c6f6ffe: Merge "Camera2: replace partial quirks with normal partial result" into lmp-dev
* commit '
3bce07590a097d2e904daa549e3083415e3c4051':
Camera2: replace partial quirks with normal partial result
Craig Stout [Thu, 17 Jul 2014 23:33:44 +0000 (23:33 +0000)]
am
51ff3b68: Fix timepicker double done buttons.
* commit '
51ff3b686347d4b0ce638b1556ab47b5c10140be':
Fix timepicker double done buttons.
Craig Stout [Thu, 17 Jul 2014 18:32:09 +0000 (11:32 -0700)]
Fix timepicker double done buttons.
Leanback theme uses a legacy layout with a done button, but
apps won't necessarily have target apilevel L.
Change-Id: Ib38b08df1fe07bd8fb4e64e93633ce0b7eb12567
Filip Gruszczynski [Thu, 17 Jul 2014 23:24:55 +0000 (23:24 +0000)]
am
23c51de9: resolved conflicts for merge of
bbc49941 to lmp-dev
* commit '
23c51de92cf52f02b7ff014790224199abf2e86a':
Only use bottom outset for main display.
Filip Gruszczynski [Thu, 17 Jul 2014 23:20:24 +0000 (16:20 -0700)]
resolved conflicts for merge of
bbc49941 to lmp-dev
Change-Id: If8e607ab1946c3ca5bb8960d32fdefebbfb21ffe
John Spurlock [Thu, 17 Jul 2014 23:15:32 +0000 (23:15 +0000)]
am
d92f55cb: Merge "Shade: Hide status icons, take 2." into lmp-dev
* commit '
d92f55cb1169c51858152b9787ba5d3e685ae86b':
Shade: Hide status icons, take 2.
Christopher Tate [Thu, 17 Jul 2014 23:04:24 +0000 (23:04 +0000)]
am
912793dc: Properly end full restore attempt if getNextFullRestoreDataChunk() fails
* commit '
912793dc95c09d384587195c667958723cac646a':
Properly end full restore attempt if getNextFullRestoreDataChunk() fails
Christopher Tate [Thu, 17 Jul 2014 22:58:12 +0000 (15:58 -0700)]
Properly end full restore attempt if getNextFullRestoreDataChunk() fails
Don't just drop the error return on the floor and retry (forever!).
Change-Id: I5f0ef2d09ea286d813add69517f865e474341b43
Chris Craik [Thu, 17 Jul 2014 22:42:29 +0000 (22:42 +0000)]
am
a987914f: Merge "[HWUI]: fix residual line on FrameBuffer" into lmp-dev
* commit '
a987914f5c43a1651846121e5009a84bb05f87b0':
[HWUI]: fix residual line on FrameBuffer
Michael Wright [Thu, 17 Jul 2014 22:04:05 +0000 (22:04 +0000)]
am
4d2ee15a: Merge "Add MediaProjection APIs." into lmp-dev
* commit '
4d2ee15a7dfe005461b0bdac8f518b283311fcfb':
Add MediaProjection APIs.
Chris Craik [Thu, 17 Jul 2014 21:47:39 +0000 (21:47 +0000)]
am
8470bb0a: (-s ours) am
152d9e61: Merge "[HWUI]: fix residual line on FrameBuffer"
* commit '
8470bb0ac9e5d8bc389b57b24363af31a0ec74d7':
[HWUI]: fix residual line on FrameBuffer
Ben Murdoch [Thu, 17 Jul 2014 21:41:22 +0000 (21:41 +0000)]
am
015ca040: Merge "Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast." into lmp-dev
* commit '
015ca0408e423d17dbf3b30ffa846ab6b6bd8a7a':
Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast.
Ying Wang [Thu, 17 Jul 2014 21:36:00 +0000 (21:36 +0000)]
Ying Wang [Thu, 17 Jul 2014 21:30:54 +0000 (14:30 -0700)]
Fix sdk build.
Change-Id: I9073747f7a12f826fabf99c34dce813edf6462c1
Andrew Lee [Thu, 17 Jul 2014 21:30:04 +0000 (21:30 +0000)]
am
3441f3c5: am
9eb532f5: Merge "Pass through video state when answering a call." into lmp-dev
* commit '
3441f3c5da64c441f1fe9c4be06e3aeac87b9f5f':
Pass through video state when answering a call.
Evan Charlton [Thu, 17 Jul 2014 21:29:51 +0000 (21:29 +0000)]
am
1f42afc6: am
58299755: Merge "Plumb through StatusHints change notifications" into lmp-dev
* commit '
1f42afc6b8a4f1e0e643167f550821fd25b3fb0a':
Plumb through StatusHints change notifications
John Spurlock [Thu, 17 Jul 2014 21:29:37 +0000 (21:29 +0000)]
am
47631221: am
d75d1ef0: Merge "QS: Fix crash switching users." into lmp-dev
* commit '
47631221aeb7839b0e790423263e50076bb4266a':
QS: Fix crash switching users.
Craig Mautner [Thu, 17 Jul 2014 21:29:32 +0000 (21:29 +0000)]
am
64dc5b09: am
20b338d9: Merge "Restore calling identity before checking permission" into lmp-dev
* commit '
64dc5b09f1d398541486dd7beb777c71c1a4f0ec':
Restore calling identity before checking permission
RoboErik [Thu, 17 Jul 2014 21:29:28 +0000 (21:29 +0000)]
am
4f4d8180: am
4e8b237d: Merge "return false for media keys if no controller" into lmp-dev
* commit '
4f4d81805635072186c4eb63d395f995d9f8db2d':
return false for media keys if no controller
Sandeep Siddhartha [Fri, 18 Jul 2014 02:28:55 +0000 (02:28 +0000)]
Merge "Test hotword flow" into lmp-dev
Sandeep Siddhartha [Thu, 17 Jul 2014 06:55:41 +0000 (23:55 -0700)]
Test hotword flow
- Also fix a few StrictMode violations in DatabaseHelper
Change-Id: I93f27407dae34cc0dca5e9f891d4ca718d6010a5
Michael Wright [Thu, 17 Jul 2014 21:59:19 +0000 (21:59 +0000)]
Merge "Add MediaProjection APIs." into lmp-dev
Michael Wright [Wed, 9 Jul 2014 01:07:36 +0000 (18:07 -0700)]
Add MediaProjection APIs.
The new MediaProjection infrastructure allows the system to hand out
tokens granting the ability to capture the screen's contents, audio,
etc. at a granular level. It's intended to be used both for screen
casting, via the cast APIs, as well as screen sharing via third party
applications.
The screen sharing case is implemented, but all of audio capturing
is still forthcoming.
Change-Id: I4b24669bed7083e11413c10ed8d6b025f5375316
Wonsik Kim [Fri, 18 Jul 2014 02:19:12 +0000 (02:19 +0000)]
Merge "TIF: one-to-many relationship for TvInputService to TvInputInfo" into lmp-dev
Wonsik Kim [Wed, 25 Jun 2014 05:12:48 +0000 (14:12 +0900)]
TIF: one-to-many relationship for TvInputService to TvInputInfo
The scope of this change is to provide a skeleton code for supporting
multiple TV input per service.
Bug:
16138420
Change-Id: Ic51355902d5e0424b8fc8a75c495d4781a7ed744
Zhijun He [Fri, 18 Jul 2014 01:02:20 +0000 (01:02 +0000)]
Merge "Camera2: partialResultCount should be optional" into lmp-dev
Zhijun He [Fri, 18 Jul 2014 00:45:54 +0000 (17:45 -0700)]
Camera2: partialResultCount should be optional
Change-Id: Iacd2b5e8f388c18cbff0f1cefdb5c10812ae751e
Jinsuk Kim [Fri, 18 Jul 2014 00:24:09 +0000 (00:24 +0000)]
Merge "Remove system audio output option for HdmiControlService" into lmp-dev
destradaa [Thu, 17 Jul 2014 21:04:28 +0000 (21:04 +0000)]
am
607d3271: Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev
* commit '
607d3271089e4874028aca9cfbede38c557961bb':
Fix exceptions in ActivityRecognition platform stack.
Eino-Ville Talvala [Thu, 17 Jul 2014 20:59:30 +0000 (20:59 +0000)]
am
7e6dd457: am
97bc6530: Merge "Add PackageManager features for differentiating camera2 devices" into lmp-dev
* commit '
7e6dd45734c4eb906f20d02d326ee1ee19a55bb9':
Add PackageManager features for differentiating camera2 devices
Winson Chung [Thu, 17 Jul 2014 20:59:26 +0000 (20:59 +0000)]
am
2a2b956e: am
3bf3d3c0: Merge "Fixing optimization in Task loading. (Bug
16372369)" into lmp-dev
* commit '
2a2b956e3f405b91fb2fdcaabc663a799dec69b2':
Fixing optimization in Task loading. (Bug
16372369)
Chris Craik [Thu, 17 Jul 2014 20:59:23 +0000 (20:59 +0000)]
am
13171876: am
8ca30207: Merge "Minor cleanups around color usage" into lmp-dev
* commit '
1317187663ee869b9c6655abce1211cd1520ee11':
Minor cleanups around color usage
Chris Craik [Thu, 17 Jul 2014 20:59:17 +0000 (20:59 +0000)]
am
deec48ed: am
19f0c01c: Merge "Simplify ViewRootImpl\'s AttachInfo usage" into lmp-dev
* commit '
deec48edf40ba4ebdd7bf6cb281b03b0cd8d231e':
Simplify ViewRootImpl's AttachInfo usage
Amith Yamasani [Thu, 17 Jul 2014 20:59:12 +0000 (20:59 +0000)]
am
562b7f0d: am
56e7c4ef: Merge "Split telephony restrictions into outgoing calls and sms" into lmp-dev
* commit '
562b7f0d1373404682e35bd37c99907d3d94e29a':
Split telephony restrictions into outgoing calls and sms
Adam Powell [Thu, 17 Jul 2014 20:58:56 +0000 (20:58 +0000)]
am
35b4be8b: am
21b1b8b9: Add nested pre-fling for nested scrolling
* commit '
35b4be8b87452a169cc3f3c55ea4aee37ef2e076':
Add nested pre-fling for nested scrolling
Joe Fernandez [Thu, 17 Jul 2014 20:58:46 +0000 (20:58 +0000)]
am
c12515e3: am
aafe9d65: am
64ae9303: am
e1e81a9e: am
e287cf33: docs: Update ADT-1 page with supported apps
* commit '
c12515e3f1119e265e5807f360a96d9daf1c6055':
docs: Update ADT-1 page with supported apps
John Reck [Thu, 17 Jul 2014 20:58:42 +0000 (20:58 +0000)]
am
042db5e1: am
bce422bd: Merge "Fix logging" into lmp-dev
* commit '
042db5e1283ec33a2c0045bf2ce6be2f3f1dc7c9':
Fix logging
Ruben Brunk [Thu, 17 Jul 2014 20:58:38 +0000 (20:58 +0000)]
am
ff8ea9c5: am
0a749af3: Merge "camera2: Fix swapped Face detection commands." into lmp-dev
* commit '
ff8ea9c5f1a0651bd2230c62e3e6be85ba24fb0e':
camera2: Fix swapped Face detection commands.
Jeff Sharkey [Thu, 17 Jul 2014 20:58:31 +0000 (20:58 +0000)]
am
37f7e245: am
375d5b90: Merge "Support cluster-style installs for bundled apps." into lmp-dev
* commit '
37f7e24584b0a85adc6d699818e3e863c261e4ed':
Support cluster-style installs for bundled apps.
Sandeep Siddhartha [Thu, 17 Jul 2014 20:58:22 +0000 (20:58 +0000)]
am
15cafc26: am
4b360037: Support model deletion
* commit '
15cafc26085a0de7767db4d9000f588b1a4409f6':
Support model deletion
Craig Mautner [Thu, 17 Jul 2014 20:58:17 +0000 (20:58 +0000)]
am
73c69b27: am
c2d339a6: Merge "resolved conflicts for merge of
0a931069 to lmp-dev" into lmp-dev
* commit '
73c69b2727b311d12f1ca8ad197db7cbe83d162c':
Additional cleanup after stack deletion.
Adrian Roos [Thu, 17 Jul 2014 20:58:13 +0000 (20:58 +0000)]
am
627e93b0: am
26f08cdc: Merge "QS Guest fixes" into lmp-dev
* commit '
627e93b0ad11ec90309ca9f5fd69b426696b3069':
QS Guest fixes
Christopher Tate [Thu, 17 Jul 2014 20:58:09 +0000 (20:58 +0000)]
am
5763ad39: am
e78826f6: Add BackupAgent.onRestoreFinished() callback
* commit '
5763ad39f5cb5923b910c7cbd834707f65043bde':
Add BackupAgent.onRestoreFinished() callback
ztenghui [Thu, 17 Jul 2014 20:58:05 +0000 (20:58 +0000)]
am
f93ffd99: am
e1bc5ddb: Add the RTL support to VectorDrawable.
* commit '
f93ffd9941c5a4e5c7b256cab6da027f2457063c':
Add the RTL support to VectorDrawable.
John Reck [Thu, 17 Jul 2014 20:58:01 +0000 (20:58 +0000)]
am
ff70ea07: am
47751fe1: Revert "Separate Canvas JNI code from the implementation."
* commit '
ff70ea07c2e167a0b66624f7b69068c826c74008':
Revert "Separate Canvas JNI code from the implementation."
Winson Chung [Thu, 17 Jul 2014 20:57:58 +0000 (20:57 +0000)]
am
1a1fa42b: am
1e214f1d: Fixing regression in flinging not updating the stack. (Bug
16371020)
* commit '
1a1fa42b9502dc3c95e0103505b276083a2a5692':
Fixing regression in flinging not updating the stack. (Bug
16371020)
Adam Connors [Thu, 17 Jul 2014 20:57:53 +0000 (20:57 +0000)]
am
bab7ceaf: am
d50ec637: Merge "Create DPM APIs for cross profile callerId" into lmp-dev
* commit '
bab7ceaf157a81d18ee1404bb6a17c6c05549f5b':
Create DPM APIs for cross profile callerId
Niels Egberts [Thu, 17 Jul 2014 20:57:50 +0000 (20:57 +0000)]
am
64b0ebfc: am
a66d298e: Merge "TtsSpan builders for each TtsSpan type. DO NOT MERGE" into lmp-dev
* commit '
64b0ebfcf9644c99d70e639eee14536e9f64484f':
TtsSpan builders for each TtsSpan type. DO NOT MERGE
Nancy Chen [Thu, 17 Jul 2014 20:57:46 +0000 (20:57 +0000)]
am
74e775a5: am
4a9b99f5: API changes to enable account selection for a call
* commit '
74e775a56ce0af604f0b8bd493d270c4f15bacc9':
API changes to enable account selection for a call
Craig Mautner [Thu, 17 Jul 2014 20:57:42 +0000 (20:57 +0000)]
am
96de06e6: am
b1c0b008: Merge "resolved conflicts for merge of
75f31740 to lmp-dev" into lmp-dev
* commit '
96de06e63e63fa66c4c5b419164c74b512d00ae8':
Wait for all windows to draw before turning screen on
Martin Kosiba [Thu, 17 Jul 2014 20:57:38 +0000 (20:57 +0000)]
am
fbb2246c: am
92486999: Allow for appending of resources to an AssetManager.
* commit '
fbb2246c6d72d98452fcda9b6a79689012eb5614':
Allow for appending of resources to an AssetManager.
Alexandra Gherghina [Thu, 17 Jul 2014 20:57:31 +0000 (20:57 +0000)]
am
14b5a9b4: am
dbfd0744: Ads per-user APIs to manage accounts through the AccountManager
* commit '
14b5a9b452d8b47617f5d908778caaf745527fe9':
Ads per-user APIs to manage accounts through the AccountManager
Amith Yamasani [Thu, 17 Jul 2014 20:57:27 +0000 (20:57 +0000)]
am
9f831baf: am
467bc0ef: Merge "Keep track of user_setup_complete in DPMS" into lmp-dev
* commit '
9f831baf7b1b53029f1112d9bc3d91c10fe26479':
Keep track of user_setup_complete in DPMS
Jae Seo [Thu, 17 Jul 2014 20:57:23 +0000 (20:57 +0000)]
am
77da1b05: am
f977db2e: Merge "TIF: Add TvInputInfo.getParentId" into lmp-dev
* commit '
77da1b0585a69bd931cd167576462775b7b52e68':
TIF: Add TvInputInfo.getParentId
Kenny Guy [Thu, 17 Jul 2014 20:57:19 +0000 (20:57 +0000)]
am
0dfd3e04: am
41482465: Merge "Allow app restrictions for uninstalled packages." into lmp-dev
* commit '
0dfd3e04f5da364e3500d3848ba3d21b3215716e':
Allow app restrictions for uninstalled packages.
Chris Craik [Thu, 17 Jul 2014 20:57:15 +0000 (20:57 +0000)]
am
41157d33: am
ec9c58c1: Merge "Initializing variables - generally a good practice" into lmp-dev
* commit '
41157d33a939dd8b3cc876a4c95b3ba561dd3ff3':
Initializing variables - generally a good practice
Craig Stout [Thu, 17 Jul 2014 20:56:19 +0000 (20:56 +0000)]
am
68e9eb34: Fix legacyMode for leanback timepicker
* commit '
68e9eb34d5b35a092ca329d78a5c39f643e390af':
Fix legacyMode for leanback timepicker
Craig Stout [Thu, 17 Jul 2014 18:25:52 +0000 (11:25 -0700)]
Fix legacyMode for leanback timepicker
Change-Id: Idcd9627f330918d8b2de144af28e749c47602769
Andres Morales [Thu, 17 Jul 2014 20:48:33 +0000 (20:48 +0000)]
am
e9f27df7: Permit settings to "wipe" the persistent partition
* commit '
e9f27df72263e769ac5325a7523d6f5379c6015a':
Permit settings to "wipe" the persistent partition
Andres Morales [Thu, 10 Jul 2014 22:40:24 +0000 (15:40 -0700)]
Permit settings to "wipe" the persistent partition
One of the requirements is that when the user does a
factory reset through settings, all data on the
persistent partition should be cleared.
This adds one last API method that allows settings
to wipe the partition.
Bug:
14288780
Change-Id: Ib87ee741d1e5195814516ae1d66eb7c4cf754dcf
Zhijun He [Thu, 17 Jul 2014 20:40:32 +0000 (20:40 +0000)]
am
4c6f6ffe: Merge "Camera2: replace partial quirks with normal partial result" into lmp-dev
* commit '
4c6f6ffe214444a4e924d189581e99ba2319b01f':
Camera2: replace partial quirks with normal partial result
Andrew Lee [Thu, 17 Jul 2014 20:24:17 +0000 (20:24 +0000)]
am
9eb532f5: Merge "Pass through video state when answering a call." into lmp-dev
* commit '
9eb532f594f1ff3c290a92ab9b7bca55176dede3':
Pass through video state when answering a call.
Evan Charlton [Thu, 17 Jul 2014 20:20:09 +0000 (20:20 +0000)]
am
58299755: Merge "Plumb through StatusHints change notifications" into lmp-dev
* commit '
58299755075aa3c32c413b54824f3a46321da49f':
Plumb through StatusHints change notifications
John Spurlock [Thu, 17 Jul 2014 20:02:14 +0000 (20:02 +0000)]
am
d75d1ef0: Merge "QS: Fix crash switching users." into lmp-dev
* commit '
d75d1ef07c175c8a48a126f4e36172e03c30987c':
QS: Fix crash switching users.
Filip Gruszczynski [Thu, 17 Jul 2014 19:55:27 +0000 (19:55 +0000)]
am
a76164e1: Merge "Only use bottom outset for main display." into klp-modular-dev
* commit '
a76164e1d0d283baf412c18999e680d93bd50f01':
Only use bottom outset for main display.
Craig Mautner [Thu, 17 Jul 2014 19:53:26 +0000 (19:53 +0000)]
am
20b338d9: Merge "Restore calling identity before checking permission" into lmp-dev
* commit '
20b338d949e6995853f37960241af010db7c8e40':
Restore calling identity before checking permission