OSDN Git Service
Adam Lesinski [Tue, 29 Jul 2014 17:36:44 +0000 (17:36 +0000)]
Merge "Have AEP GL feature depend on GLES 3.1 in badging" into lmp-dev
John Reck [Tue, 29 Jul 2014 17:19:55 +0000 (17:19 +0000)]
Merge "Add layer/texture creation tracing" into lmp-dev
John Reck [Tue, 29 Jul 2014 16:49:13 +0000 (09:49 -0700)]
Add layer/texture creation tracing
Change-Id: I0af6a36c97a9f5f35d28e0e36539ba8d8011ea7c
Eric Laurent [Tue, 29 Jul 2014 17:14:00 +0000 (17:14 +0000)]
Merge "Fix capitalization on AudioPort callback method names" into lmp-dev
Eric Laurent [Tue, 29 Jul 2014 16:29:30 +0000 (09:29 -0700)]
Fix capitalization on AudioPort callback method names
Change-Id: I87963ea7290989333781bf8905c9ae640c34d943
RoboErik [Tue, 29 Jul 2014 15:49:51 +0000 (08:49 -0700)]
Fix checkbuild
Change-Id: I66321c6da4f921cee2db6f9f05312a6a8edc66d3
Alexandra Gherghina [Fri, 25 Jul 2014 20:32:18 +0000 (21:32 +0100)]
Rename work icon symbol to match the prefix used for badges.
Also renames the images for consistency.
Bug:
16369104
Change-Id: I19f97ae22cb2ee4f7db210f083badc1a30520b44
Yorke Lee [Tue, 29 Jul 2014 16:52:44 +0000 (16:52 +0000)]
Merge "Add new proximity sensors in Telecomm (1/3)" into lmp-dev
Robert Ly [Tue, 29 Jul 2014 16:48:33 +0000 (16:48 +0000)]
am
9c53194a: am
58967bfb: am
1c977b37: Merge "docs: fix typo bug
16623189" into klp-modular-docs
* commit '
9c53194a6fccd9980d4ee3fabe4466b16d73580b':
docs: fix typo bug
16623189
Robert Ly [Tue, 29 Jul 2014 16:48:17 +0000 (16:48 +0000)]
am
0029ef67: am
dadb473e: am
9613b433: Merge "docs: fix typo" into klp-modular-docs
* commit '
0029ef67598336e3a774c6cf1dfde8245136484a':
docs: fix typo
Ricardo Cervera [Tue, 29 Jul 2014 16:48:11 +0000 (16:48 +0000)]
am
7f214e61: am
8d1aa957: am
652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs
* commit '
7f214e6149b38af10224cf9f8f8f4959eebd52a6':
docs: Describe the alloc tracker in Android Studio
Ricardo Cervera [Tue, 29 Jul 2014 16:48:01 +0000 (16:48 +0000)]
am
5ff390be: am
df881ccc: am
321e0302: docs: Fix Wear docs issues.
* commit '
5ff390be1b0b968ccf28e693b602b8e8b5f448e9':
docs: Fix Wear docs issues.
Robert Ly [Tue, 29 Jul 2014 16:34:01 +0000 (16:34 +0000)]
am
58967bfb: am
1c977b37: Merge "docs: fix typo bug
16623189" into klp-modular-docs
* commit '
58967bfbe824f020194872a6d0a5204b54e6043a':
docs: fix typo bug
16623189
Robert Greenwalt [Mon, 28 Jul 2014 23:32:19 +0000 (16:32 -0700)]
Remove dead code 4.
Removing:
handleDnsConfigurationChange
updateDnsLocked
updateRoutes
handleConnectivityChange
handleConnect
handleDisconnect
Adding a missing flushVmDnsCache and setting of mActiveDefaultNetwork
Change-Id: I681fc72c317833ea1deb42db0b43d2adb21baeff
Robert Ly [Tue, 29 Jul 2014 16:30:07 +0000 (16:30 +0000)]
am
1c977b37: Merge "docs: fix typo bug
16623189" into klp-modular-docs
* commit '
1c977b3744dbe916edde2e256a39c30e5888ef4f':
docs: fix typo bug
16623189
Yorke Lee [Mon, 28 Jul 2014 21:39:23 +0000 (14:39 -0700)]
Add new proximity sensors in Telecomm (1/3)
Add the following two APIs in Telecomm and use them in InCallUI
setProximitySensorOn
setProximitySensorOff(boolean turnScreenOnImmediately)
Bug:
16573954
Change-Id: I8219e9c659f4ea4493f5cd5c8bcaa95a98d180e2
Robert Ly [Tue, 29 Jul 2014 15:42:24 +0000 (15:42 +0000)]
am
dadb473e: am
9613b433: Merge "docs: fix typo" into klp-modular-docs
* commit '
dadb473e2b9dc7bf2691dea7153c6700102e6562':
docs: fix typo
Robert Ly [Tue, 29 Jul 2014 15:38:02 +0000 (15:38 +0000)]
am
9613b433: Merge "docs: fix typo" into klp-modular-docs
* commit '
9613b433f47162d008f034afbb16deac16532662':
docs: fix typo
Ricardo Cervera [Tue, 29 Jul 2014 15:32:57 +0000 (15:32 +0000)]
am
8d1aa957: am
652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs
* commit '
8d1aa95729a44a953dd5cd434f2c7380e6d1f641':
docs: Describe the alloc tracker in Android Studio
Ricardo Cervera [Tue, 29 Jul 2014 15:29:00 +0000 (15:29 +0000)]
am
652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs
* commit '
652e5c7ef1f8176dc680f7c4ba782164269b03b0':
docs: Describe the alloc tracker in Android Studio
Ricardo Cervera [Tue, 29 Jul 2014 15:07:56 +0000 (15:07 +0000)]
am
df881ccc: am
321e0302: docs: Fix Wear docs issues.
* commit '
df881ccc1fe5efefa4a71cf8e5f663f9e2911151':
docs: Fix Wear docs issues.
Ricardo Cervera [Tue, 29 Jul 2014 15:01:11 +0000 (15:01 +0000)]
am
321e0302: docs: Fix Wear docs issues.
* commit '
321e030202cb74cad0dd8a4950cffe361a5072c8':
docs: Fix Wear docs issues.
Filip Gruszczynski [Mon, 28 Jul 2014 23:40:13 +0000 (23:40 +0000)]
am
d0e03392: Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev
* commit '
d0e03392394164e1e261ef8829e187ad2362d426':
Fix double chin issue, where bottom inset is applied twice.
Craig Mautner [Mon, 28 Jul 2014 23:28:59 +0000 (23:28 +0000)]
am
0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev
* commit '
0fa45d93f7265c130d5dc49a51130ed74db5cec9':
Remove PendingActivityLaunches based on stack.
Robert Ly [Tue, 29 Jul 2014 16:26:51 +0000 (16:26 +0000)]
Merge "docs: fix typo bug
16623189" into klp-modular-docs
Robert Ly [Tue, 29 Jul 2014 16:25:45 +0000 (09:25 -0700)]
docs: fix typo bug
16623189
Change-Id: Ia790587cf60cbf4e9f699605a5ad6a7dc5a06799
Robert Ly [Tue, 29 Jul 2014 15:33:17 +0000 (08:33 -0700)]
docs: fix typo
Change-Id: I4d76d625dc508e7279162d1d3ace9c32625e1358
Craig Mautner [Mon, 28 Jul 2014 23:25:55 +0000 (23:25 +0000)]
Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev
Craig Mautner [Mon, 28 Jul 2014 21:00:35 +0000 (14:00 -0700)]
Remove PendingActivityLaunches based on stack.
Was previously removing by trying to match activities, but the
activity being matched would not have been in the stack yet. Since
it doesn't get added to the stack when it goes into the list
of pending activities. By removing all pending activities associated
with the stack we clean up all such pending activities.
Fixes bug
16045752.
Change-Id: I6b5981ffcce674139837b06362e573299bbc9e52
Alan Lau [Mon, 28 Jul 2014 20:07:23 +0000 (20:07 +0000)]
am
77d6f36b: Revert "DO NOT MERGE Implement line breaking using ICU break iterator"
* commit '
77d6f36bbc76dbed51bea17d1ffcd3c1d6ffd30f':
Revert "DO NOT MERGE Implement line breaking using ICU break iterator"
Alan Lau [Mon, 28 Jul 2014 19:58:00 +0000 (19:58 +0000)]
am
40b0d4d7: Merge "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" into klp-modular-dev
* commit '
40b0d4d7519b6a1999742534513406f94c169f1f':
Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"
Alan Lau [Mon, 28 Jul 2014 19:57:55 +0000 (19:57 +0000)]
am
af60e56b: Revert "DO NOT MERGE Fix extraneous allocation and copying"
* commit '
af60e56b39582ea90ccd7601cd06350a50bf6500':
Revert "DO NOT MERGE Fix extraneous allocation and copying"
Alan Lau [Mon, 28 Jul 2014 19:50:14 +0000 (19:50 +0000)]
Revert "DO NOT MERGE Implement line breaking using ICU break iterator"
This reverts commit
0c87dfd25d5a305fb67eb328d114aada87055dd7.
Change-Id: Ibc300bb945776594099b69965cabe7220d10de2f
Anish Athalye [Mon, 28 Jul 2014 19:53:26 +0000 (19:53 +0000)]
am
1a408a34: DO NOT MERGE Fix extraneous allocation and copying
* commit '
1a408a344c7921d7c943826bea3ce0cdd822583d':
DO NOT MERGE Fix extraneous allocation and copying
Alan Lau [Mon, 28 Jul 2014 19:51:01 +0000 (19:51 +0000)]
Revert "DO NOT MERGE Fix extraneous allocation and copying"
This reverts commit
1a408a344c7921d7c943826bea3ce0cdd822583d.
Change-Id: If5a19a4cc54e76aeddac0923e28bbf310e78feb4
Alan Lau [Mon, 28 Jul 2014 19:10:29 +0000 (19:10 +0000)]
am
97170e0c: Merge "DO NOT MERGE Implement line breaking using ICU break iterator" into klp-modular-dev
* commit '
97170e0c48bbff21ef6773110d950621131cf9dd':
DO NOT MERGE Implement line breaking using ICU break iterator
Anish Athalye [Mon, 28 Jul 2014 19:10:19 +0000 (19:10 +0000)]
am
a28e4764: DO NOT MERGE Fix line breaking for clusters in narrow views
* commit '
a28e4764994283c3595dd41f12e425cf7dc0d985':
DO NOT MERGE Fix line breaking for clusters in narrow views
Anish Athalye [Tue, 8 Jul 2014 20:27:14 +0000 (13:27 -0700)]
DO NOT MERGE Fix extraneous allocation and copying
With breaks being allocated the way it was, there were 16 ints with
value 0 being stored in the beginning of the vector. Because of the way
the rest of the code is structured, this did not result in incorrect
operation, but it still wasted time and memory.
Change-Id: Ic0df3e5484417da51f2465ec2d72222fefffc18a
(cherry picked from commit
733b3c0f8b77fefcd234c94170faa4e7bd76074c)
Anish Athalye [Fri, 27 Jun 2014 21:37:53 +0000 (14:37 -0700)]
DO NOT MERGE Fix line breaking for clusters in narrow views
Clusters were broken incorrectly when in narrow views (when the width of
the cluster was greater than the width of a view). Also, out() calls
were modifying fm, so clusters that were too wide were not positioned
correctly.
Change-Id: I521f8dc6338f5f1de6858af3f0c0bd320aa46bc0
(cherry picked from commit
162713dd0b72af79c1b2286985f7e79f043cd915)
Ricardo Cervera [Tue, 29 Jul 2014 15:26:56 +0000 (15:26 +0000)]
Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs
Ricardo Cervera [Mon, 28 Jul 2014 17:50:32 +0000 (10:50 -0700)]
docs: Fix Wear docs issues.
Bug:
16624918
Bug:
16626217
Bug:
16626415
Bug:
16624384
Bug:
16623147
Change-Id: I774f19aded22562b891f9d2ccc35f0befb50f21c
Filip Gruszczynski [Mon, 28 Jul 2014 23:34:59 +0000 (23:34 +0000)]
Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev
Alan Lau [Mon, 28 Jul 2014 19:53:43 +0000 (19:53 +0000)]
Merge "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" into klp-modular-dev
Alan Lau [Mon, 28 Jul 2014 19:52:11 +0000 (19:52 +0000)]
Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"
This reverts commit
a28e4764994283c3595dd41f12e425cf7dc0d985.
Change-Id: I73fe7b3e6bdba327e55a58afd36a7f58f49945d0
Alan Lau [Mon, 28 Jul 2014 19:05:45 +0000 (19:05 +0000)]
Merge "DO NOT MERGE Implement line breaking using ICU break iterator" into klp-modular-dev
Anish Athalye [Tue, 24 Jun 2014 21:39:43 +0000 (14:39 -0700)]
DO NOT MERGE Implement line breaking using ICU break iterator
Change-Id: I4ad98757aa2eab5dbc2ae44c0391e900ef20c4d0
(cherry picked from commit
f8133ae5896926aaf70f12bc0dd1f36a6704c0f5)
Adam Lesinski [Fri, 25 Jul 2014 21:38:54 +0000 (14:38 -0700)]
Have AEP GL feature depend on GLES 3.1 in badging
AAPT dump badging should output the uses-gl-es tag with
a version of 3.1 when android.hardware.opengles.aep is
declared as a feature.
Change-Id: I8affc6dad574c8303c6ba9810ad8e6e205ea9506
Filip Gruszczynski [Fri, 25 Jul 2014 21:25:16 +0000 (14:25 -0700)]
Fix double chin issue, where bottom inset is applied twice.
This changes how windowOutsetBottom is applied. Instead of being added to
whatever inset is already set, it overwrites it.
Bug:
16567038
Change-Id: Idedae93b790652e9de0519764ea7a03841f9e8fd
George Mount [Tue, 29 Jul 2014 15:00:09 +0000 (15:00 +0000)]
Merge "Allow a "ghost view" that paint a different view from the overlay." into lmp-dev
George Mount [Wed, 9 Jul 2014 00:25:25 +0000 (17:25 -0700)]
Allow a "ghost view" that paint a different view from the overlay.
Bug
15744995
The ghost view doesn't route touch events, but hides another
view in its normal parent, and paints it as a child of another
ViewGroup or ViewGroupOverlay.
Change-Id: I352e14c366ccfb7303cee1dbff8563c673fd12ff
Marcin Kosiba [Sat, 19 Jul 2014 00:10:47 +0000 (01:10 +0100)]
Make webview text encoding and keySystemUUID mapping and error page public.
These resources will need to be accessed from the APK-bundled
WebView and therefore need to be made public.
BUG:
11505352
Change-Id: I5e988671cc8342ed4146a90b4de1246460232050
Robert Ly [Tue, 29 Jul 2014 15:34:47 +0000 (15:34 +0000)]
Merge "docs: fix typo" into klp-modular-docs
Ricardo Cervera [Thu, 24 Jul 2014 17:15:09 +0000 (10:15 -0700)]
docs: Describe the alloc tracker in Android Studio
Change-Id: Ic3cfc94950029104ec75ab04a9fac51ba64dd9a9
Craig Mautner [Fri, 25 Jul 2014 02:19:53 +0000 (02:19 +0000)]
am
a0bb44ef: Merge "Finish crashed activities immediately" into klp-modular-dev
* commit '
a0bb44efe96ca70635b64dac8922b225d1a19407':
Finish crashed activities immediately
Craig Mautner [Fri, 25 Jul 2014 01:30:51 +0000 (01:30 +0000)]
Merge "Finish crashed activities immediately" into klp-modular-dev
Craig Mautner [Thu, 24 Jul 2014 20:32:37 +0000 (13:32 -0700)]
Finish crashed activities immediately
By finishing crashed activities right away the VirtualDisplays
associated with ActivityView are removed immediately rather than
being deferred. Also there is no waiting for Pause (0.5 sec) and
Destroy (10 sec) timeouts to expire.
Fixes bug
15092354.
Change-Id: Ie4941cb19dcc6f6fc61b2475162ea2794c9558a2
Prashant Malani [Thu, 24 Jul 2014 18:06:03 +0000 (18:06 +0000)]
am
b4dcc64f: Merge "Revert "Remove circular mask"" into klp-modular-dev
* commit '
b4dcc64fe6314b139ac17aa296419bbf153df2f6':
Revert "Remove circular mask"
Lorenzo Colitti [Tue, 29 Jul 2014 14:13:22 +0000 (14:13 +0000)]
Merge "Use getBoundURL for network validation." into lmp-dev
George Mount [Thu, 24 Jul 2014 16:44:37 +0000 (09:44 -0700)]
Add default propagation back to Explode.
Bug
16217557
Change-Id: I47460db128749af978077755a777068392492aee
Lorenzo Colitti [Thu, 17 Jul 2014 16:57:34 +0000 (01:57 +0900)]
Use getBoundURL for network validation.
Disable for now, until we're more confident that it doesn't choke
on strange captive portals.
Change-Id: Ic8e66a379d32c915c949df70ca0d38535cd5dbe0
Jim Miller [Tue, 29 Jul 2014 04:34:43 +0000 (04:34 +0000)]
Merge "Add new DevicePolicyManager API to allow fine-grained TrustAgent management" into lmp-dev
Jim Miller [Sat, 19 Jul 2014 02:00:02 +0000 (19:00 -0700)]
Add new DevicePolicyManager API to allow fine-grained TrustAgent management
This adds a new feature that allows a device admin to specify a
whitelist of features that are allowed for the given admin.
Change-Id: I83f853318efbcf72308532d0a997374f73fa9c10
John Spurlock [Tue, 29 Jul 2014 02:11:09 +0000 (02:11 +0000)]
Merge "Settings: Constants for notification settings." into lmp-dev
Sailesh Nepal [Mon, 28 Jul 2014 17:25:27 +0000 (10:25 -0700)]
Handle synchronous failed connection
Change-Id: I406ccbdd1f70c85456b6e0d689332cf40a756707
Filip Gruszczynski [Tue, 29 Jul 2014 01:08:09 +0000 (01:08 +0000)]
am
896a82d7: am
d0e03392: Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev
* commit '
896a82d77e732c7387b2279bcdd0f04d696b13df':
Fix double chin issue, where bottom inset is applied twice.
Craig Mautner [Tue, 29 Jul 2014 01:07:59 +0000 (01:07 +0000)]
am
09875ec7: am
0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev
* commit '
09875ec7292b19e07c38b6127406d6aa7490e26c':
Remove PendingActivityLaunches based on stack.
John Spurlock [Sun, 27 Jul 2014 17:27:47 +0000 (13:27 -0400)]
Settings: Constants for notification settings.
Bug:
16208321
Change-Id: Iaf18dfc2edda9d80553f02ea0a74236230f89079
John Spurlock [Mon, 28 Jul 2014 17:37:13 +0000 (13:37 -0400)]
Zen: follow independent ringer mode changes.
Bug:
16624498
Change-Id: Ib623118970a82c8406c714687b1b516378fe7824
Sreeram Ramachandran [Sun, 27 Jul 2014 21:18:26 +0000 (14:18 -0700)]
Allow VPNs to add/remove link addresses dynamically.
Bug:
15409819
Change-Id: If91fc6891d7ce04060362c6cde8c57462394c4e8
vandwalle [Tue, 29 Jul 2014 03:57:47 +0000 (03:57 +0000)]
Merge "fix typo in scanresult" into lmp-dev
vandwalle [Tue, 29 Jul 2014 03:48:33 +0000 (20:48 -0700)]
fix typo in scanresult
Change-Id: I4a7998097419bebeb94b23785567865b19205642
vandwalle [Tue, 29 Jul 2014 03:38:27 +0000 (03:38 +0000)]
Merge "add debug info to wificonfiguration dump" into lmp-dev
vandwalle [Tue, 29 Jul 2014 03:26:58 +0000 (20:26 -0700)]
add debug info to wificonfiguration dump
Change-Id: I4887afa21d6e1d9463fa4a5cd0aa7ae22973239f
John Spurlock [Tue, 29 Jul 2014 03:36:50 +0000 (03:36 +0000)]
Merge "Zen: Classify notifications using the alarm stream." into lmp-dev
John Spurlock [Tue, 29 Jul 2014 03:30:45 +0000 (23:30 -0400)]
Zen: Classify notifications using the alarm stream.
Also:
- include audio attributes in dump
- workaround for recent AudioAttributes change.
Bug:
16455021
Change-Id: Ib9b047a74cff3e0cc354a5aaa96bc92a400b3845
Sailesh Nepal [Tue, 29 Jul 2014 03:34:43 +0000 (03:34 +0000)]
Merge "Fix WTF when creating a lazily initialized connection" into lmp-dev
Sailesh Nepal [Tue, 29 Jul 2014 03:33:07 +0000 (20:33 -0700)]
Fix WTF when creating a lazily initialized connection
Change-Id: I16af7e99d07f83b17f111acbf0a3285d09cee13e
Riley Andrews [Mon, 28 Jul 2014 23:54:49 +0000 (23:54 +0000)]
Merge "Add cursor flags into SpriteController to suppor async cursor updates. - This is fairly blindly taken from nvidia's implementation." into lmp-dev
Riley Andrews [Mon, 7 Jul 2014 18:47:35 +0000 (11:47 -0700)]
Add cursor flags into SpriteController to suppor async cursor updates.
- This is fairly blindly taken from nvidia's implementation.
Change-Id: I825ecbd9cb4b394793dce079591b37efca546bbe
Jing Zhao [Wed, 23 Jul 2014 17:01:19 +0000 (12:01 -0500)]
Enable config CDMA home system by mcc mnc
Define CDMA home system IDs for Verizon
Change-Id: Ie10d838173df3095238c50d419bd9de589e34e55
Winson Chung [Mon, 28 Jul 2014 23:21:07 +0000 (23:21 +0000)]
Merge "Updating lock-to-app look." into lmp-dev
Winson Chung [Mon, 28 Jul 2014 18:01:57 +0000 (11:01 -0700)]
Updating lock-to-app look.
- Adding seek bars for tweaking values when in debug mode
Change-Id: I92ae7b431ee170f5d8b31f34349d51a6b7f9ddef
Eric Laurent [Fri, 25 Jul 2014 15:13:10 +0000 (08:13 -0700)]
rename AudioSystem::newAudioSessionId()
Rename AudioSystem::newAudioSessionId() to
AudioSystem::newAudioUniqueId() as it can be used
also for I/O handles.
Bug:
12378680.
Change-Id: I3f6658db2b8db8f56d1a99f12b15429e293631e6
Christopher Tate [Mon, 28 Jul 2014 23:13:21 +0000 (23:13 +0000)]
Merge "Provide outside-facing API for data management intent+label" into lmp-dev
Christopher Tate [Mon, 28 Jul 2014 22:02:04 +0000 (15:02 -0700)]
Provide outside-facing API for data management intent+label
Bug
16346320
Change-Id: I3f4c2f4b700c77880ba3d8db7c92cdb404763d0d
Jinsuk Kim [Mon, 28 Jul 2014 23:02:17 +0000 (23:02 +0000)]
Merge "Add MHL getPortInfo" into lmp-dev
Jinsuk Kim [Fri, 25 Jul 2014 04:02:51 +0000 (13:02 +0900)]
Add MHL getPortInfo
Allows MHL support flag to be put into port information
Bug:
16215362
Change-Id: I1873c8e60b02f47a97509576fc40d57efb056817
Jinsuk Kim [Thu, 24 Jul 2014 05:48:34 +0000 (14:48 +0900)]
MHL controller for subcommand reception
Implement HdmiMhlController command reception part.
Bug:
16215362
Change-Id: Iabf46dfaa762fae8c537e4d4ebd3469388a6b7c3
Michael Wright [Fri, 25 Jul 2014 21:05:42 +0000 (14:05 -0700)]
Add missing documentation for createVirtualDisplay
Fix incorrect access modifier in Activity documentation.
Change-Id: Id41da6ccbdfa8b53c89360c899f3a43aec899982
Ruben Brunk [Fri, 25 Jul 2014 22:12:33 +0000 (15:12 -0700)]
camera2: Update preview counter after request completed.
Bug:
15116722
- This was causing the preview counter to double decrement
for requests where the jpeg callback was executed first.
Change-Id: I6bfdaa7da7f68e86e05dc7ac60ceb3c8d5a0104a
Winson Chung [Fri, 25 Jul 2014 22:46:57 +0000 (15:46 -0700)]
Fixing issue with Recents not triggering correctly for secondary users. (Bug
15689540)
Baligh Uddin [Mon, 28 Jul 2014 23:13:17 +0000 (23:13 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Mon, 28 Jul 2014 19:29:45 +0000 (12:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0495a69db49b3475537a3546bcb4d246b4dd018b
Auto-generated-cl: translation import
Julia Reynolds [Mon, 28 Jul 2014 14:03:41 +0000 (14:03 +0000)]
Merge "Remove the profile/device owner user restriction bypass." into lmp-dev
Julia Reynolds [Thu, 24 Jul 2014 22:21:29 +0000 (18:21 -0400)]
Remove the profile/device owner user restriction bypass.
Bug:
16566096
Change-Id: I4a56046df44d36d82edc64fc727e8cad5dc75382
Jeff Brown [Sat, 26 Jul 2014 02:34:00 +0000 (02:34 +0000)]
Merge "Fix a deadlock due to AMS calling into WMS with its lock held." into lmp-dev
Jeff Brown [Sat, 26 Jul 2014 02:30:05 +0000 (19:30 -0700)]
Fix a deadlock due to AMS calling into WMS with its lock held.
The full deadlock cycle involved ActivityManagerService,
WindowManagerService, and DevicePolicyManagerService.
Fixed by posting the work of enabling the screen to the handler
instead of doing it immediately while holding the activity manager
lock.
Bug:
16578860
Change-Id: I10514cd2df993c7193747ae823e1990a2c34e196
Jeff Brown [Sat, 26 Jul 2014 02:03:28 +0000 (19:03 -0700)]
Don't suppress haptic feedback on keyguard anymore.
This enables haptic feedback from virtual keys, lift-to-wake,
and long-press power to work as expected on the keyguard.
There doesn't seem to be a good reason for us to block haptic feedback
on keyguard anymore. The PIN, pattern, and password locks already
bypass this check and vibrate and require a swipe to access in
the first place. So there doesn't seem to be much potential
for accidental vibration anymore.
If this becomes a problem then we can investigate more targeted
means to suppress undesired vibration.
Added some debugging code to VibratorService.
Bug:
16535403
Change-Id: Ia7a5d8c35244009db36c358e5cbcbf8cf5d68768
Sandeep Siddhartha [Fri, 25 Jul 2014 23:19:42 +0000 (16:19 -0700)]
Add read/writeBlob to Parcel
These are {@hide}en for now.
Bug:
16516353
Change-Id: Ie1635617ee8611a78be9068a7ce674e34c30301d
Jay Civelli [Fri, 25 Jul 2014 23:35:59 +0000 (23:35 +0000)]
Revert "Add new intent to prompt user for their device credential. DO NOT MERGE"
Breaks the JavaDoc generation.
This reverts commit
c82a11573810ed4d1f40568d19afc27f726829af.
Change-Id: I9e38a0d6ba0935d4967b50023030c99727bfc839