OSDN Git Service
Wale Ogunwale [Wed, 22 Oct 2014 22:17:18 +0000 (22:17 +0000)]
Merge "Fix issue #
17789629: PopupWindow overlaps with navigation bar." into lmp-mr1-dev
Leon Scroggins III [Wed, 22 Oct 2014 22:06:25 +0000 (22:06 +0000)]
Merge "Remove outdated tests for custom decoder." into lmp-mr1-dev
Aravind Akella [Wed, 22 Oct 2014 22:02:18 +0000 (22:02 +0000)]
Merge "Change body sensor permission string." into lmp-mr1-dev
Leon Scroggins III [Wed, 22 Oct 2014 21:53:03 +0000 (21:53 +0000)]
Merge "Decoder only returns true on complete success." into lmp-mr1-dev
Aravind Akella [Tue, 21 Oct 2014 18:07:20 +0000 (11:07 -0700)]
Change body sensor permission string.
Change-Id: If02ac48bfa6f1bd87616f89d6e7d0881c4d30967
Bug:
18023754
xin He [Wed, 22 Oct 2014 21:22:18 +0000 (21:22 +0000)]
am
265e3da0: am
5085c4c2: Merge "Show ProgressDialog when waiting for radio to turn on when provisioning." into lmp-dev
* commit '
265e3da00668a0769be331349541050dd6603c2b':
Show ProgressDialog when waiting for radio to turn on when provisioning.
Ricardo Cervera [Wed, 22 Oct 2014 20:48:39 +0000 (20:48 +0000)]
am
e9438c7b: am
0ae6e37e: Merge "docs: Removing extra semicolons in Wear notif examples." into lmp-dev
* commit '
e9438c7b17caf0253427031a010456f594741616':
docs: Removing extra semicolons in Wear notif examples.
Quddus Chong [Wed, 22 Oct 2014 20:48:35 +0000 (20:48 +0000)]
am
52357721: am
b8796e44: docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies.
* commit '
523577213072d63f6775ea3155bfc93080314494':
docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies.
John Reck [Wed, 22 Oct 2014 20:48:27 +0000 (20:48 +0000)]
am
36c2aa4a: Merge "Surface:lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev
* commit '
36c2aa4a6394047f02c4f236233b41d738ff56c1':
Surface:lockHardwareCanvas DO NOT MERGE
Geoff Mendal [Wed, 22 Oct 2014 20:48:22 +0000 (20:48 +0000)]
am
c9e4f942: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
c9e4f942276506c25922e0d61a3978cc2b1c9bc6':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 22 Oct 2014 20:48:15 +0000 (20:48 +0000)]
am
b571b926: (-s ours) Import translations. DO NOT MERGE
* commit '
b571b926f00aee176792aedd964de8230c75c401':
Import translations. DO NOT MERGE
Deepanshu Gupta [Wed, 22 Oct 2014 20:47:37 +0000 (20:47 +0000)]
am
37779f07: Merge "Check Bridge init before disposing." into lmp-dev automerge:
568f16c
* commit '
37779f07496462afa4b5d88725e8a004a7e10bc0':
Check Bridge init before disposing.
Jinsuk Kim [Wed, 22 Oct 2014 20:47:34 +0000 (20:47 +0000)]
am
07b481a9: Merge "CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE" into lmp-dev automerge:
0c74939 -s ours
* commit '
07b481a9f77a7ac0dc430706aadfa262802cfdba':
CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE
Santos Cordon [Wed, 22 Oct 2014 20:47:15 +0000 (20:47 +0000)]
am
40f15895: am
028217eb: Merge "Add hidden method to access a connection\'s service." into lmp-dev
* commit '
40f158954491c4d2587e0b2a13cd07195bc27b25':
Add hidden method to access a connection's service.
Filip Gruszczynski [Wed, 22 Oct 2014 20:45:59 +0000 (20:45 +0000)]
am
baecc0b2: Merge "Disable activity\'s translucency until it starts being swiped away." into lmp-sprout-dev
* commit '
baecc0b2d111c3bc930b85d5450f1ff8b7b83395':
Disable activity's translucency until it starts being swiped away.
Guang Zhu [Wed, 22 Oct 2014 20:45:55 +0000 (20:45 +0000)]
am
55bc7dc4: am
ccbeb61a: Block monkey from creating user profiles
* commit '
55bc7dc4288e2c2cdd0bd9c2d06c38e00d139d5c':
Block monkey from creating user profiles
Adrian Roos [Wed, 22 Oct 2014 20:45:26 +0000 (20:45 +0000)]
am
c19586a8: am
7b4a38b1: Delay discovery of system trust agents
* commit '
c19586a8055b27bc7c7cc3ac3e1f38eec8cc82a9':
Delay discovery of system trust agents
Christopher Tate [Wed, 22 Oct 2014 20:27:14 +0000 (20:27 +0000)]
Merge "Don't cancel scheduled jobs when packages are updated" into lmp-mr1-dev
Alan Viverette [Wed, 22 Oct 2014 20:03:45 +0000 (20:03 +0000)]
Merge "Check MenuItem.isVisible() for keyboard shortcuts" into lmp-mr1-dev
Leon Scroggins III [Wed, 22 Oct 2014 18:11:36 +0000 (14:11 -0400)]
Remove outdated tests for custom decoder.
These tests don't appear to be meaningful. We are comparing an
unused decoder against one that is used.
Keeping this test building (the primary changes to this directory
in a while) is not believed to be worth the effort.
BUG:
17419670
Change-Id: Ia0862f2a1de1fb9d744382bb949f6c1638a1a12a
Christopher Tate [Mon, 20 Oct 2014 23:29:20 +0000 (16:29 -0700)]
Don't cancel scheduled jobs when packages are updated
Only cancel the app's jobs when it is fully uninstalled, not when
it's being updated to a newer version.
Bug
18059252
Change-Id: I6cf617013ec8e9e9abd90e366d7a6ab0711790de
Christopher Tate [Wed, 22 Oct 2014 17:36:42 +0000 (10:36 -0700)]
Fix settings db update sequence
The 'global' table only exists in the owner-user db instance; make
sure to apply global-setting update steps only when bringing up that
instance.
Bug
18069830
Change-Id: I843eabe710d9487de94690921d61adb181b45ed2
xin He [Wed, 22 Oct 2014 17:22:51 +0000 (17:22 +0000)]
am
5085c4c2: Merge "Show ProgressDialog when waiting for radio to turn on when provisioning." into lmp-dev
* commit '
5085c4c2933219831bde11a482c8b2934e4a259f':
Show ProgressDialog when waiting for radio to turn on when provisioning.
xin He [Wed, 22 Oct 2014 17:19:24 +0000 (17:19 +0000)]
Merge "Show ProgressDialog when waiting for radio to turn on when provisioning." into lmp-dev
Ricardo Cervera [Wed, 22 Oct 2014 17:06:56 +0000 (17:06 +0000)]
am
0ae6e37e: Merge "docs: Removing extra semicolons in Wear notif examples." into lmp-dev
* commit '
0ae6e37e64144dc180c164cfe42fa8faf59f0d53':
docs: Removing extra semicolons in Wear notif examples.
Ricardo Cervera [Wed, 22 Oct 2014 17:03:43 +0000 (17:03 +0000)]
Merge "docs: Removing extra semicolons in Wear notif examples." into lmp-dev
Quddus Chong [Wed, 22 Oct 2014 17:01:51 +0000 (17:01 +0000)]
am
b8796e44: docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies.
* commit '
b8796e441ce8b4f2e2f75df9689637f6e18f18db':
docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies.
Quddus Chong [Wed, 22 Oct 2014 01:22:38 +0000 (18:22 -0700)]
docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies.
Change-Id: Ib152d6577d2369b71aa52e6013a2ff1fbcab0c6e
John Spurlock [Wed, 22 Oct 2014 16:44:28 +0000 (16:44 +0000)]
Merge "PowerUI: Post/cancel notification as UserHandle.ALL." into lmp-mr1-dev
Ye Wen [Wed, 22 Oct 2014 16:36:58 +0000 (16:36 +0000)]
Merge "Send HTTP status code back in case of MMS HTTP failure (1/3)" into lmp-mr1-dev
John Reck [Wed, 22 Oct 2014 16:25:49 +0000 (16:25 +0000)]
Merge "Surface:lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Wed, 22 Oct 2014 15:53:01 +0000 (15:53 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Wed, 22 Oct 2014 15:49:32 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Wed, 22 Oct 2014 15:46:41 +0000 (08:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I478370f6105138f39c9dad5079b7c434fa8078b3
Auto-generated-cl: translation import
Wale Ogunwale [Wed, 22 Oct 2014 15:43:52 +0000 (15:43 +0000)]
Merge "Fix issue #
17674789: Recents icon resets if persist mode is 'persistNever'" into lmp-mr1-dev
Geoff Mendal [Wed, 22 Oct 2014 15:41:58 +0000 (08:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1a02d1751579ede64ab9d736fd1450dd0b449bfd
Auto-generated-cl: translation import
John Reck [Tue, 21 Oct 2014 17:09:36 +0000 (10:09 -0700)]
Surface:lockHardwareCanvas DO NOT MERGE
Bug:
17440886
Cherry pick of
bb2d0cc7e1d487f7021b1f9ec0c6740e41b535f2
Change-Id: I78f25cdcfc49cc6a142a51b8aab009c37be8e6de
John Spurlock [Wed, 22 Oct 2014 13:05:51 +0000 (09:05 -0400)]
PowerUI: Post/cancel notification as UserHandle.ALL.
- Post power-related notifications for all users.
- Update the pending intent actions on user switch.
- Listen for the intent actions for all users.
Bug:
17300571
Change-Id: I956f09ecf5395f31ae1c1ec0409ee251839fcef4
John Reck [Wed, 22 Oct 2014 14:18:19 +0000 (14:18 +0000)]
Merge "Fix memory corruption in test" into lmp-mr1-dev
Geoff Mendal [Wed, 22 Oct 2014 13:37:04 +0000 (06:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifca413c79959bf4b6585f0fb9b7a5ed1acf1ec9f
Auto-generated-cl: translation import
Geoff Mendal [Wed, 22 Oct 2014 13:20:08 +0000 (06:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9d15256733ff57735cfe6a07855a6633d732464c
Auto-generated-cl: translation import
Craig Mautner [Wed, 22 Oct 2014 03:01:40 +0000 (03:01 +0000)]
Merge "Debug for bug
18017409" into lmp-mr1-dev
Leon Scroggins III [Wed, 22 Oct 2014 02:00:46 +0000 (02:00 +0000)]
am
e463bc38: am
3c8bde55: Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev
* commit '
e463bc388e7f5d83f864b320dde400e390ef5817':
Report that a JavaInputStreamAdaptor is at end.
Robin Lee [Wed, 22 Oct 2014 02:00:38 +0000 (02:00 +0000)]
am
fc567900: am
e1c9489c: Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev
* commit '
fc56790085463ab410a5f407a4930b42509ad5f7':
DevicePolicy: Restore CA warning to K behaviour
Dongwon Kang [Wed, 22 Oct 2014 01:46:31 +0000 (01:46 +0000)]
Merge "TIF: add more documentation on Hardware session." into lmp-mr1-dev
Deepanshu Gupta [Wed, 22 Oct 2014 01:17:32 +0000 (01:17 +0000)]
Merge "Check Bridge init before disposing." into lmp-dev
automerge:
568f16c
* commit '
568f16ccfbe95d5a68e3e3a732565a1063d5160e':
Check Bridge init before disposing.
Jinsuk Kim [Wed, 22 Oct 2014 01:16:26 +0000 (01:16 +0000)]
Merge "CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE" into lmp-dev
automerge:
0c74939 -s ours
* commit '
0c74939024cb2aec9e8348808366170d77d6e8e7':
CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE
Craig Mautner [Wed, 22 Oct 2014 01:09:54 +0000 (18:09 -0700)]
Debug for bug
18017409
Log adding and removing windows. Log activity state changes.
Change-Id: I544be89ff9af6b13ffde70dedec291793b46a420
Deepanshu Gupta [Wed, 22 Oct 2014 00:57:30 +0000 (00:57 +0000)]
Merge "Check Bridge init before disposing." into lmp-dev
Alan Viverette [Wed, 22 Oct 2014 00:35:28 +0000 (00:35 +0000)]
Merge "Format ListPreference summary with empty string if entry is null" into lmp-mr1-dev
Alan Viverette [Wed, 22 Oct 2014 00:05:07 +0000 (17:05 -0700)]
Format ListPreference summary with empty string if entry is null
Adding serif-monospace and sans-serif-monospace font families bumped
out the previous monospace, which left the summary as %s. Returning
an unformatted summary is never correct, and we should simply return
a summary populated with an empty string.
BUG:
17666124
Change-Id: Ic22dc5dc87d9ba3ad6f6b92ee059f5c98cbf103a
Wale Ogunwale [Tue, 21 Oct 2014 23:29:51 +0000 (16:29 -0700)]
Fix issue #
17674789: Recents icon resets if persist mode is 'persistNever'
Changed TaskPersister worker thread to not delete task information on disk
for tasks that are in recents but not persistable.
Also, changed logic that writes tasks information (excluding thunmbnail)
to disk to not write information for tasks that are not persistable.
Bug:
17674789
Change-Id: Iff7c5d24677f8a75157bb6be504fc2d9d6bcc098
Santos Cordon [Tue, 21 Oct 2014 23:29:41 +0000 (23:29 +0000)]
am
028217eb: Merge "Add hidden method to access a connection\'s service." into lmp-dev
* commit '
028217eb6789e82c96ef5ff5fe0a5a9e0c740d97':
Add hidden method to access a connection's service.
Jinsuk Kim [Tue, 21 Oct 2014 23:25:57 +0000 (23:25 +0000)]
Merge "CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE" into lmp-dev
Santos Cordon [Tue, 21 Oct 2014 23:22:00 +0000 (23:22 +0000)]
Merge "Add hidden method to access a connection's service." into lmp-dev
Paul Jensen [Wed, 15 Oct 2014 01:06:14 +0000 (21:06 -0400)]
Show ProgressDialog when waiting for radio to turn on when provisioning.
Turning on the cellular radio when user selects the provisioning notification
can take 30-60s so a UI is needed to keep the user informed that the radio is
coming up. This is only for provisioning APN support (only AT&T tablets now).
bug:
15990642
Change-Id: Ibea894ee934bae2045c0462ae79bfa39d0ef3f05
Filip Gruszczynski [Tue, 21 Oct 2014 22:14:39 +0000 (22:14 +0000)]
Merge "Disable activity's translucency until it starts being swiped away." into lmp-sprout-dev
Guang Zhu [Tue, 21 Oct 2014 22:12:38 +0000 (22:12 +0000)]
am
ccbeb61a: Block monkey from creating user profiles
* commit '
ccbeb61ac21527839deb115199cbe98fa2b73c05':
Block monkey from creating user profiles
Filip Gruszczynski [Tue, 21 Oct 2014 17:11:27 +0000 (10:11 -0700)]
Disable activity's translucency until it starts being swiped away.
Change-Id: Ia5dceac7bd9ff57920a43736f9db6a33175e01ac
Jinsuk Kim [Mon, 20 Oct 2014 22:14:46 +0000 (07:14 +0900)]
CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE
A few methods are found to be missing protection with system permission.
Add enforceAccessPermission() like other methods.
Bug:
17408780
Change-Id: I58a336b5cc9df2d195bdfe7b928898dde5ff169f
(cherry picked from commit
b22d9ee0a364b10d488dd6a2e8ba69d5ca7f6258)
Adrian Roos [Tue, 21 Oct 2014 21:43:05 +0000 (21:43 +0000)]
am
7b4a38b1: Delay discovery of system trust agents
* commit '
7b4a38b197ce43cb286d80fc6c4e9713b2807f13':
Delay discovery of system trust agents
Adam Powell [Tue, 21 Oct 2014 21:41:18 +0000 (21:41 +0000)]
Merge "Intent chooser callback" into lmp-mr1-dev
Guang Zhu [Tue, 21 Oct 2014 21:33:50 +0000 (14:33 -0700)]
Block monkey from creating user profiles
Bug:
17721767
Change-Id: Ibf686d6aa5da29411ee23f8ce6826ed93c1fa970
Andrew Lee [Tue, 21 Oct 2014 21:08:45 +0000 (21:08 +0000)]
Merge "Add video calling setting to TelephonyManager." into lmp-mr1-dev
John Reck [Tue, 21 Oct 2014 20:59:51 +0000 (20:59 +0000)]
Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev
Andrew Lee [Fri, 17 Oct 2014 22:37:54 +0000 (15:37 -0700)]
Add video calling setting to TelephonyManager.
We want to add a user setting to enable/disable video calling. This
is a telephony-level setting which the user sets using Telephony's
Call Settings, and applies universally to video calls.
But this setting needs to be accessible in places such as Dialer,
so these changes are to support storing the setting in
TelephonyManager (to be implemented in PhoneInterfaceManager) and
providing access to the setting for applications like Dialer
through TelephonyManager.
+ Add function definitions to ITelephony.
+ Add function wrapper implementations in TelephonyManager.
Bug:
16014284
Change-Id: I1dce8bf5ae4f0ee115698ce9627ba8fc424dd855
John Reck [Tue, 21 Oct 2014 17:09:36 +0000 (10:09 -0700)]
Surface:lockHardwareCanvas
Bug:
17440886
Change-Id: I1f2d98c63ec1a2814c2258cf7e0096139263770a
Ricardo Cervera [Tue, 21 Oct 2014 20:15:39 +0000 (13:15 -0700)]
docs: Removing extra semicolons in Wear notif examples.
Bug:
17053734
Change-Id: If11b711e2797eeb2fc392e0658d644c585e4bc54
Andrew Lee [Tue, 21 Oct 2014 20:02:18 +0000 (20:02 +0000)]
Merge "Fire onConferenceChanged after reseting conference." into lmp-mr1-dev
Wale Ogunwale [Sat, 18 Oct 2014 23:22:01 +0000 (16:22 -0700)]
Fix issue #
17789629: PopupWindow overlaps with navigation bar.
The Lollipop release introduced a feature that allowed
apps to extend under the navigation bar. This also means
any popup window that is anchored to the bottom of its
parent window will overlap with the navigation bar if the
parent window is extending underneath the navigation bar.
This change introduces a new window flag
(FLAG_LAYOUT_ATTACHED_IN_DECOR) that allows the app to
specify if the popup window should be attached to the decor
frame of the parent window thereby avoiding an overlap
with the screen decorations.
By default the flag is set on SDK version LOLLIPOP_MR1 or
greater and cleared on lesser SDK versions.
Also, replaced flags FLAG_NEEDS_MENU_KEY and
PRIVATE_FLAG_NEEDS_MENU_KEY_SET with needsMenuKey state
variable to make room for the new
FLAG_LAYOUT_ATTACHED_IN_DECOR flag.
Bug:
17789629
Change-Id: I2150e0c6ac688c966c0e8f7e54d42fd20285bea6
Alan Viverette [Tue, 21 Oct 2014 19:21:32 +0000 (12:21 -0700)]
Check MenuItem.isVisible() for keyboard shortcuts
Parity with support-v7 change.
BUG:
18021345
Change-Id: I583b586d451a21bbd207d2b0584a396e1125ee59
Adam Powell [Thu, 9 Oct 2014 19:50:14 +0000 (12:50 -0700)]
Intent chooser callback
Let an app specify an IntentSender as an extra for ACTION_CHOOSER that
will be notified of the user's chosen target. Apps can use this to
implement things like one-touch last used affordances without
implementing their own one-off chooser UI.
Bug
17363684
Change-Id: Ic5d1d0e0c7a0bae3eda6b1d6ade993f3ba865cfa
John Spurlock [Tue, 21 Oct 2014 19:16:16 +0000 (15:16 -0400)]
VolumeDialog: Restore default-selection logic.
Bug:
18066513
Change-Id: Ie72189edf9b59fd8d192d882aaadf1ac05dcb359
John Spurlock [Tue, 21 Oct 2014 18:39:18 +0000 (18:39 +0000)]
Merge "Settings: Make SeekBarVolumizer more null-resilient." into lmp-mr1-dev
Alan Viverette [Tue, 21 Oct 2014 18:25:00 +0000 (18:25 +0000)]
Merge "Fix gradient drawable radius when specified as float, dimension" into lmp-mr1-dev
John Spurlock [Tue, 21 Oct 2014 18:23:24 +0000 (14:23 -0400)]
Settings: Make SeekBarVolumizer more null-resilient.
Now that the instances are reusable, ensure all "post" methods
do a handler check, and ensure they are all internal.
Bug:
18063070
Change-Id: Idc478c636686f666f5656f3d07bf2738ba3e9a5a
John Spurlock [Tue, 21 Oct 2014 18:16:46 +0000 (18:16 +0000)]
Merge "Sysui: Include shared prefs in service dump." into lmp-mr1-dev
Alan Viverette [Tue, 21 Oct 2014 18:16:24 +0000 (18:16 +0000)]
Merge "Prevent excessive accessibility announcements in TimePicker" into lmp-mr1-dev
Alan Viverette [Tue, 21 Oct 2014 18:14:49 +0000 (18:14 +0000)]
Merge "Propagate state changes even when we don't change drawable index" into lmp-mr1-dev
Alan Viverette [Tue, 21 Oct 2014 18:04:04 +0000 (11:04 -0700)]
Fix gradient drawable radius when specified as float, dimension
BUG:
18070756
Change-Id: I991ff792c376c9695a007f8f1187390ab5ff6e3c
Ye Wen [Tue, 21 Oct 2014 17:47:36 +0000 (10:47 -0700)]
Send HTTP status code back in case of MMS HTTP failure (1/3)
We need this in SMS app so that we can treat 404 specially
b/
17520290
Change-Id: Ifae1c1b323411143c740fb589c2b978b5ff9bc4e
Andrew Lee [Tue, 21 Oct 2014 17:32:49 +0000 (10:32 -0700)]
Fire onConferenceChanged after reseting conference.
Bug:
17423848
Change-Id: Ic53f40e806f2bfd5b49bff2caad64bb93b290bad
John Spurlock [Tue, 21 Oct 2014 16:15:28 +0000 (12:15 -0400)]
Sysui: Include shared prefs in service dump.
Also:
- Remove obsolete Prefs helper.
- Use common file for zen-mode prefs.
Bug:
18062541
Change-Id: I9a6a4733eac0ec1c55da5d359c996cb5fe3bb8af
Adrian Roos [Tue, 21 Oct 2014 15:07:39 +0000 (17:07 +0200)]
Delay discovery of system trust agents
Waits for BOOT_COMPLETED when enabling system trust agents.
This fixes an issue where no agents were discovered because the
packages were not ready after an OTA.
Bug:
18065140
Change-Id: Ibff9948e1536e07f868d6b29f432923a137091e6
Leon Scroggins III [Tue, 21 Oct 2014 13:56:42 +0000 (13:56 +0000)]
am
3c8bde55: Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev
* commit '
3c8bde5534d81518f5baf3795989f367373f7dfd':
Report that a JavaInputStreamAdaptor is at end.
Leon Scroggins III [Tue, 21 Oct 2014 13:52:29 +0000 (13:52 +0000)]
Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev
Robin Lee [Tue, 21 Oct 2014 11:58:38 +0000 (11:58 +0000)]
am
e1c9489c: Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev
* commit '
e1c9489cc40542bfa2adbb84b6fb77cff4ab8570':
DevicePolicy: Restore CA warning to K behaviour
Robin Lee [Tue, 21 Oct 2014 11:54:50 +0000 (11:54 +0000)]
Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev
Geoff Mendal [Mon, 20 Oct 2014 23:43:33 +0000 (23:43 +0000)]
am
deddb384: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
deddb38462389823c194559052c4d64ee6c3b467':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Oct 2014 23:39:57 +0000 (23:39 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 20 Oct 2014 23:21:14 +0000 (16:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idcc94d2f5b04a7eea17b530c4a8ff7f8b76fff38
Auto-generated-cl: translation import
Jinsuk Kim [Mon, 20 Oct 2014 22:50:36 +0000 (22:50 +0000)]
Merge "CEC: Add missing protections for some HdmiControlService API" into lmp-mr1-dev
Leon Scroggins III [Thu, 16 Oct 2014 20:50:41 +0000 (16:50 -0400)]
Report that a JavaInputStreamAdaptor is at end.
This prevents a naive caller from continuing to attempt to read.
BUG:
17419670
BUG:
17873145
Change-Id: Idd462ff9055aea42e8c7d5d58ef177f9e667385b
RoboErik [Mon, 20 Oct 2014 22:19:54 +0000 (22:19 +0000)]
am
f0a28411: am
2fa604fc: Merge "Add missing break to switch statement" into lmp-dev
* commit '
f0a284115a8fb089806eb87db1a20468dd55ecd3':
Add missing break to switch statement
Amit Mahajan [Mon, 20 Oct 2014 22:17:38 +0000 (22:17 +0000)]
Merge "Add a constant for invalid profile id value" into lmp-mr1-dev
Jinsuk Kim [Mon, 20 Oct 2014 22:14:46 +0000 (07:14 +0900)]
CEC: Add missing protections for some HdmiControlService API
A few methods are found to be missing protection with system permission.
Add enforceAccessPermission() like other methods.
Bug:
17408780
Change-Id: I58a336b5cc9df2d195bdfe7b928898dde5ff169f
RoboErik [Mon, 20 Oct 2014 22:14:10 +0000 (22:14 +0000)]
am
2fa604fc: Merge "Add missing break to switch statement" into lmp-dev
* commit '
2fa604fc59ded63a416066a0bc66f63069cae7f3':
Add missing break to switch statement
RoboErik [Mon, 20 Oct 2014 22:08:06 +0000 (22:08 +0000)]
Merge "Add missing break to switch statement" into lmp-dev
RoboErik [Mon, 20 Oct 2014 21:56:32 +0000 (14:56 -0700)]
Add missing break to switch statement
the skip to queue item case was falling through when it shouldn't.
bug:
18058515
Change-Id: Ica20b59efad12a58ad16501146fc9a0d4595e184
Griff Hazen [Mon, 20 Oct 2014 21:46:12 +0000 (21:46 +0000)]
am
aec92e2e: Merge "Disable zen log printouts by default" into lmp-sprout-dev
* commit '
aec92e2eca4b4197ac45dcde265e2797c7ea9133':
Disable zen log printouts by default