OSDN Git Service
Andre Eisenbach [Thu, 25 Sep 2014 16:52:10 +0000 (16:52 +0000)]
am
c9e7505a: am
630f9671: am
fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev
* commit '
c9e7505a0ab0ff337e09bed6afdeef86512cda5f':
Remove remanents of onConnectionCongested in framwork
Vinit Deshpande [Thu, 25 Sep 2014 16:52:07 +0000 (16:52 +0000)]
am
31103492: am
0604f9b7: am
f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev
* commit '
311034922d795ec7807ff3f29f399568a6600bf7':
Introduce config setting for scanning mac OUI
Lajos Molnar [Thu, 25 Sep 2014 16:52:03 +0000 (16:52 +0000)]
am
c8d99e5c: am
7c993e8c: am
aa1f0856: Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev
* commit '
c8d99e5ca8b0c7d3e2e83023a6930fbf8664ce78':
MediaCodec: revalidate cached queued input buffers if queue fails
Jeff Sharkey [Thu, 25 Sep 2014 16:51:59 +0000 (16:51 +0000)]
am
b47a75f2: am
b8bbeff0: am
45ef18b6: Merge "Include reason when wiping data." into lmp-dev
* commit '
b47a75f227bd43f90c2f437ea991d5fa42603d04':
Include reason when wiping data.
ztenghui [Thu, 25 Sep 2014 16:51:54 +0000 (16:51 +0000)]
am
0ecbcd00: am
64816d53: am
a00457a6: Merge "Add one more test and update old tests" into lmp-dev
* commit '
0ecbcd0043a6fb065b86de6da6edc8e967420a24':
Add one more test and update old tests
ztenghui [Thu, 25 Sep 2014 16:51:50 +0000 (16:51 +0000)]
am
6bdc2e08: am
7ac0a907: am
c793e67c: Merge "Fix AVD for CTS failure." into lmp-dev
* commit '
6bdc2e08b712f147e5aeec39afded3d723b8426c':
Fix AVD for CTS failure.
Andre Eisenbach [Thu, 25 Sep 2014 16:38:19 +0000 (16:38 +0000)]
am
630f9671: am
fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev
* commit '
630f9671beae6a09e8a1fa315b632d292a83c4f0':
Remove remanents of onConnectionCongested in framwork
Vinit Deshpande [Thu, 25 Sep 2014 16:38:15 +0000 (16:38 +0000)]
am
0604f9b7: am
f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev
* commit '
0604f9b7eaf51920c177f5af845bb254c3695074':
Introduce config setting for scanning mac OUI
Lajos Molnar [Thu, 25 Sep 2014 16:38:12 +0000 (16:38 +0000)]
am
7c993e8c: am
aa1f0856: Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev
* commit '
7c993e8c16de0322ee231979b798cc40cd5b1576':
MediaCodec: revalidate cached queued input buffers if queue fails
Jeff Sharkey [Thu, 25 Sep 2014 16:38:08 +0000 (16:38 +0000)]
am
b8bbeff0: am
45ef18b6: Merge "Include reason when wiping data." into lmp-dev
* commit '
b8bbeff0796847bbe98deb2d84989b656356873c':
Include reason when wiping data.
ztenghui [Thu, 25 Sep 2014 16:38:05 +0000 (16:38 +0000)]
am
64816d53: am
a00457a6: Merge "Add one more test and update old tests" into lmp-dev
* commit '
64816d534c0bc42f5e83bd24bb6c452f61e61fdc':
Add one more test and update old tests
ztenghui [Thu, 25 Sep 2014 16:38:00 +0000 (16:38 +0000)]
am
7ac0a907: am
c793e67c: Merge "Fix AVD for CTS failure." into lmp-dev
* commit '
7ac0a907051287a9cb01b3b54332a7ba865102e6':
Fix AVD for CTS failure.
Andre Eisenbach [Thu, 25 Sep 2014 16:22:45 +0000 (16:22 +0000)]
am
fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev
* commit '
fe99f9f42ad1a45922c906bacd5ea56d58667245':
Remove remanents of onConnectionCongested in framwork
Vinit Deshpande [Thu, 25 Sep 2014 16:22:40 +0000 (16:22 +0000)]
am
f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev
* commit '
f9b8c88c6529daebe9676d7c440fcd3e478ec034':
Introduce config setting for scanning mac OUI
Lajos Molnar [Thu, 25 Sep 2014 16:22:31 +0000 (16:22 +0000)]
am
aa1f0856: Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev
* commit '
aa1f0856a144f2f2ba14c6358d633887e7e8b936':
MediaCodec: revalidate cached queued input buffers if queue fails
Jeff Sharkey [Thu, 25 Sep 2014 16:22:22 +0000 (16:22 +0000)]
am
45ef18b6: Merge "Include reason when wiping data." into lmp-dev
* commit '
45ef18b63e78fd853865f42d9369a5c9b4dd4ba0':
Include reason when wiping data.
ztenghui [Thu, 25 Sep 2014 16:22:10 +0000 (16:22 +0000)]
am
a00457a6: Merge "Add one more test and update old tests" into lmp-dev
* commit '
a00457a60160f27e15c9d75824057f7d914b7b7d':
Add one more test and update old tests
ztenghui [Thu, 25 Sep 2014 16:22:06 +0000 (16:22 +0000)]
am
c793e67c: Merge "Fix AVD for CTS failure." into lmp-dev
* commit '
c793e67ca93a1550fa68c887ef00d207ac1e1d84':
Fix AVD for CTS failure.
Evan Charlton [Thu, 25 Sep 2014 16:06:48 +0000 (16:06 +0000)]
am
8bc6212e: Merge "Revert "@hide ConnectionService APIs."" into lmp-mr1-dev
* commit '
8bc6212eeb926b1f00e73af924e1f072f99160b3':
Revert "@hide ConnectionService APIs."
Evan Charlton [Thu, 25 Sep 2014 15:58:34 +0000 (15:58 +0000)]
Merge "Revert "@hide ConnectionService APIs."" into lmp-mr1-dev
Ruben Brunk [Thu, 25 Sep 2014 10:14:07 +0000 (10:14 +0000)]
am
ae7ff48d: am
6a7dcedf: am
8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
* commit '
ae7ff48d3aaf2459d7f146e1a80a55334664dd16':
camera2: Hide JPEGs in RGBA gralloc buffers.
Joe Fernandez [Thu, 25 Sep 2014 10:14:03 +0000 (10:14 +0000)]
am
3386946d: am
a4f4bd40: am
a73fa92c: am
2c1ef532: am
1968b919: am
b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
* commit '
3386946d60245a5b5777bfb4e79d175e72ff2481':
docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
Ruben Brunk [Thu, 25 Sep 2014 10:03:40 +0000 (10:03 +0000)]
am
6a7dcedf: am
8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
* commit '
6a7dcedf4f3a3af8ccbaebc9ec9dd02796d4e93e':
camera2: Hide JPEGs in RGBA gralloc buffers.
Joe Fernandez [Thu, 25 Sep 2014 10:03:37 +0000 (10:03 +0000)]
am
a4f4bd40: am
a73fa92c: am
2c1ef532: am
1968b919: am
b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
* commit '
a4f4bd40cad463e6faeebec6694dd78ce7456f20':
docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
Ruben Brunk [Thu, 25 Sep 2014 09:51:33 +0000 (09:51 +0000)]
am
8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
* commit '
8acfdc7bf6b8ee5250351723ab2eef28f2b71e51':
camera2: Hide JPEGs in RGBA gralloc buffers.
Andre Eisenbach [Wed, 24 Sep 2014 23:57:01 +0000 (23:57 +0000)]
Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev
Vinit Deshpande [Wed, 24 Sep 2014 23:50:04 +0000 (23:50 +0000)]
Merge "Introduce config setting for scanning mac OUI" into lmp-dev
Lajos Molnar [Wed, 24 Sep 2014 23:40:55 +0000 (23:40 +0000)]
Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev
Jeff Sharkey [Wed, 24 Sep 2014 23:27:24 +0000 (23:27 +0000)]
Merge "Include reason when wiping data." into lmp-dev
ztenghui [Wed, 24 Sep 2014 23:07:32 +0000 (23:07 +0000)]
Merge "Add one more test and update old tests" into lmp-dev
ztenghui [Wed, 24 Sep 2014 23:07:17 +0000 (23:07 +0000)]
Merge "Fix AVD for CTS failure." into lmp-dev
Ruben Brunk [Wed, 24 Sep 2014 22:51:54 +0000 (22:51 +0000)]
Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
RoboErik [Wed, 24 Sep 2014 22:44:40 +0000 (22:44 +0000)]
am
e73770ce: am
0cbc26db: am
2a638f08: Merge "Clear the volume cache for all inactive state transitions" into lmp-dev
* commit '
e73770ce807a9ed235eaaf4de951645407de6bc4':
Clear the volume cache for all inactive state transitions
Amith Yamasani [Wed, 24 Sep 2014 22:44:36 +0000 (22:44 +0000)]
am
57924e40: am
de208628: am
eb5fb023: Merge "Return masked location mode for managed profiles" into lmp-dev
* commit '
57924e406c3ca224a9e0d2fcba6db213caa1a54b':
Return masked location mode for managed profiles
Dianne Hackborn [Wed, 24 Sep 2014 22:44:32 +0000 (22:44 +0000)]
am
a5fd257a: am
98b7584e: am
2a857c63: Merge "Work on issue #
17624121: Settings crash while launching on wiped device" into lmp-dev
* commit '
a5fd257acb22a8cdb170327856dd7145afc93b5b':
Work on issue #
17624121: Settings crash while launching on wiped device
Igor Murashkin [Wed, 24 Sep 2014 22:44:28 +0000 (22:44 +0000)]
am
e6339fe4: am
ee0b9782: am
7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev
* commit '
e6339fe4a71951dd6bff91a54a289137ff691f1a':
camera2: Increase preview frame timeout
Dianne Hackborn [Wed, 24 Sep 2014 22:44:24 +0000 (22:44 +0000)]
am
2ef7a650: am
d5a4e173: am
5576641a: Merge "Fix issue #
17614141: Add protection for accessing images" into lmp-dev
* commit '
2ef7a650d6bb2764b2c3c566f99a1ac1b7f19372':
Fix issue #
17614141: Add protection for accessing images
Svetoslav [Wed, 24 Sep 2014 22:44:20 +0000 (22:44 +0000)]
am
d32e5cc8: am
737fa54b: am
299a89b5: Merge "Print spooler should not crash if fed non-PDF content." into lmp-dev
* commit '
d32e5cc8d56d8b8a5638417ae86bd16661304466':
Print spooler should not crash if fed non-PDF content.
Derek Sollenberger [Wed, 24 Sep 2014 22:44:15 +0000 (22:44 +0000)]
am
946c697a: am
07f751ba: am
c37e905a: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev
* commit '
946c697abc160fc49446fa68976aff45efcd9005':
Fix memory leak where we close the descriptor instead of the file.
Mathieu Chartier [Wed, 24 Sep 2014 22:44:11 +0000 (22:44 +0000)]
am
025b8203: am
443c7647: am
a061388d: Merge "Fix dalvik map names" into lmp-dev
* commit '
025b8203ffa22a7f6fc9aa3f054ab5f903735233':
Fix dalvik map names
Chet Haase [Wed, 24 Sep 2014 22:44:06 +0000 (22:44 +0000)]
am
62a7327e: am
326c443e: am
66287788: Merge "Avoid drawing the starting window twice" into lmp-dev
* commit '
62a7327e74f1915d0fdb9b45b3e4f17e3967e1a4':
Avoid drawing the starting window twice
Selim Cinek [Wed, 24 Sep 2014 22:44:01 +0000 (22:44 +0000)]
am
31dc5801: Only show FAB for the frontmost task
* commit '
31dc5801f9da5acd8a250abc5c12d5e2bcf5da5d':
Only show FAB for the frontmost task
RoboErik [Wed, 24 Sep 2014 22:28:12 +0000 (22:28 +0000)]
am
0cbc26db: am
2a638f08: Merge "Clear the volume cache for all inactive state transitions" into lmp-dev
* commit '
0cbc26dbee49058a8f2da8a4659943b3ee928b7d':
Clear the volume cache for all inactive state transitions
Amith Yamasani [Wed, 24 Sep 2014 22:28:06 +0000 (22:28 +0000)]
am
de208628: am
eb5fb023: Merge "Return masked location mode for managed profiles" into lmp-dev
* commit '
de20862808bcbd379b30d51271b2389f04b1924e':
Return masked location mode for managed profiles
Dianne Hackborn [Wed, 24 Sep 2014 22:27:41 +0000 (22:27 +0000)]
am
98b7584e: am
2a857c63: Merge "Work on issue #
17624121: Settings crash while launching on wiped device" into lmp-dev
* commit '
98b7584e1c45b9963a59de1625594c704065c575':
Work on issue #
17624121: Settings crash while launching on wiped device
Igor Murashkin [Wed, 24 Sep 2014 22:27:36 +0000 (22:27 +0000)]
am
ee0b9782: am
7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev
* commit '
ee0b9782a7ac2844f2942ba44bad4c36f235169c':
camera2: Increase preview frame timeout
Dianne Hackborn [Wed, 24 Sep 2014 22:27:23 +0000 (22:27 +0000)]
am
d5a4e173: am
5576641a: Merge "Fix issue #
17614141: Add protection for accessing images" into lmp-dev
* commit '
d5a4e17395b62867945f0bd1c7df59fbe9dfba3c':
Fix issue #
17614141: Add protection for accessing images
Svetoslav [Wed, 24 Sep 2014 22:27:07 +0000 (22:27 +0000)]
am
737fa54b: am
299a89b5: Merge "Print spooler should not crash if fed non-PDF content." into lmp-dev
* commit '
737fa54b1a5fc50fdcacdbad95ad2309bd40340c':
Print spooler should not crash if fed non-PDF content.
Derek Sollenberger [Wed, 24 Sep 2014 22:27:00 +0000 (22:27 +0000)]
am
07f751ba: am
c37e905a: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev
* commit '
07f751baac5be1184fa8868176fc7e8b4791c3f9':
Fix memory leak where we close the descriptor instead of the file.
Mathieu Chartier [Wed, 24 Sep 2014 22:26:56 +0000 (22:26 +0000)]
am
443c7647: am
a061388d: Merge "Fix dalvik map names" into lmp-dev
* commit '
443c76479684c6aecf132b415aa7052c6bd9d174':
Fix dalvik map names
Chet Haase [Wed, 24 Sep 2014 22:25:58 +0000 (22:25 +0000)]
am
326c443e: am
66287788: Merge "Avoid drawing the starting window twice" into lmp-dev
* commit '
326c443e1bed7d0bd711ebfeb7f5c0003d534281':
Avoid drawing the starting window twice
Prerepa Viswanadham [Fri, 19 Sep 2014 17:57:54 +0000 (10:57 -0700)]
Remove remanents of onConnectionCongested in framwork
Bug:
17289507
Change-Id: Ia28c39822141edd0e4dc3f623b8c2f280fc5f943
Selim Cinek [Mon, 22 Sep 2014 16:35:45 +0000 (18:35 +0200)]
Only show FAB for the frontmost task
Bug:
17522143
Change-Id: I882185f27a4e9da57007818f678451a7e6e1ef81
Joe Fernandez [Wed, 24 Sep 2014 22:04:15 +0000 (22:04 +0000)]
am
a73fa92c: am
2c1ef532: am
1968b919: am
b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
* commit '
a73fa92c2e0bada989b9196425e179fcc5b8b0de':
docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
Joe Fernandez [Wed, 24 Sep 2014 21:54:08 +0000 (21:54 +0000)]
am
2c1ef532: am
1968b919: am
b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
* commit '
2c1ef5328cee7059b1ab0d8de849c2fa474f88dd':
docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
RoboErik [Wed, 24 Sep 2014 21:47:48 +0000 (21:47 +0000)]
am
2a638f08: Merge "Clear the volume cache for all inactive state transitions" into lmp-dev
* commit '
2a638f08dc4c750bfd0e358768ddde98c7f23b09':
Clear the volume cache for all inactive state transitions
RoboErik [Wed, 24 Sep 2014 21:35:55 +0000 (21:35 +0000)]
Merge "Clear the volume cache for all inactive state transitions" into lmp-dev
Amith Yamasani [Wed, 24 Sep 2014 21:34:44 +0000 (21:34 +0000)]
am
eb5fb023: Merge "Return masked location mode for managed profiles" into lmp-dev
* commit '
eb5fb0236f3ed0c8068d5e65f2396047ae69f78b':
Return masked location mode for managed profiles
Amith Yamasani [Wed, 24 Sep 2014 21:28:41 +0000 (21:28 +0000)]
Merge "Return masked location mode for managed profiles" into lmp-dev
Dianne Hackborn [Wed, 24 Sep 2014 21:12:58 +0000 (21:12 +0000)]
am
2a857c63: Merge "Work on issue #
17624121: Settings crash while launching on wiped device" into lmp-dev
* commit '
2a857c633ddf2cdb02c768f9340ecb5abe468c48':
Work on issue #
17624121: Settings crash while launching on wiped device
Lajos Molnar [Wed, 24 Sep 2014 21:07:35 +0000 (14:07 -0700)]
MediaCodec: revalidate cached queued input buffers if queue fails
For legacy behavior (using getInputBuffers) input buffer needs to
be made valid if queue fails. Otherwise, it becomes unusable,
and the buffer still belongs to the user.
In the new model, buffers obtained by getIn/OutputBuffer will
become invalid even if queue/release fails.
We do not do the same logic for output buffers, as these should
not be accessed even if releaseBuffer fails (which really should not
happen anyway unless codec is in bad state).
Bug:
17630446
Change-Id: Ica72a168d8aea97a0ee3f3ef49c60d0ca5a9fa06
Igor Murashkin [Wed, 24 Sep 2014 21:07:24 +0000 (21:07 +0000)]
am
7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev
* commit '
7ddc2313a35637f087b68fea385df9d56b7f3f6d':
camera2: Increase preview frame timeout
Dianne Hackborn [Wed, 24 Sep 2014 21:06:46 +0000 (21:06 +0000)]
Merge "Work on issue #
17624121: Settings crash while launching on wiped device" into lmp-dev
Evan Charlton [Wed, 24 Sep 2014 21:04:51 +0000 (14:04 -0700)]
Revert "@hide ConnectionService APIs."
This reverts commit
86935c406e4a8bb0e2ad871b51009f3603df9e87.
Igor Murashkin [Wed, 24 Sep 2014 20:58:18 +0000 (20:58 +0000)]
Merge "camera2: Increase preview frame timeout" into lmp-dev
Jeff Sharkey [Wed, 24 Sep 2014 18:45:24 +0000 (11:45 -0700)]
Include reason when wiping data.
This will help us track down who requested a data wipe.
Bug:
17412160
Change-Id: If8413e5d6377773f37e8b34ae3d26347226a027c
Igor Murashkin [Wed, 24 Sep 2014 20:48:09 +0000 (13:48 -0700)]
camera2: Increase preview frame timeout
Some devices, especially those with HAL2/HAL3 frames will have a large
delay between the first preview frame and and the camera open. This is
because the streams are configured lazily so it adds extra latency.
Increase the timeout to make it significantly less likely to get frame drops.
Bug:
17628866
Change-Id: I48dcda8507fb7eb31c3f426f833418126171c204
Dianne Hackborn [Wed, 24 Sep 2014 20:51:16 +0000 (20:51 +0000)]
am
5576641a: Merge "Fix issue #
17614141: Add protection for accessing images" into lmp-dev
* commit '
5576641a9709a03df5f4e45ac91ff94fa5b1bb18':
Fix issue #
17614141: Add protection for accessing images
Dianne Hackborn [Wed, 24 Sep 2014 20:44:17 +0000 (20:44 +0000)]
Merge "Fix issue #
17614141: Add protection for accessing images" into lmp-dev
George Mount [Wed, 24 Sep 2014 20:34:09 +0000 (20:34 +0000)]
am
5506d92e: Fix NPE when detached View is added as a shared element.
* commit '
5506d92e98f69c81ec2f5bbf82726e3333cf7e85':
Fix NPE when detached View is added as a shared element.
Svetoslav [Wed, 24 Sep 2014 20:33:54 +0000 (20:33 +0000)]
am
299a89b5: Merge "Print spooler should not crash if fed non-PDF content." into lmp-dev
* commit '
299a89b50f1268f3c4cd0e58727f7d7805b573b2':
Print spooler should not crash if fed non-PDF content.
Derek Sollenberger [Wed, 24 Sep 2014 20:33:50 +0000 (20:33 +0000)]
am
c37e905a: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev
* commit '
c37e905a245e3134a417677b93d5a020bab62d75':
Fix memory leak where we close the descriptor instead of the file.
Svetoslav [Wed, 24 Sep 2014 20:29:46 +0000 (20:29 +0000)]
Merge "Print spooler should not crash if fed non-PDF content." into lmp-dev
Svetoslav [Wed, 24 Sep 2014 20:19:49 +0000 (13:19 -0700)]
Print spooler should not crash if fed non-PDF content.
It is possible that a buggy app breaks the contract and provides
content to be printed in format other than PDF. This was leading
to a crash in the print spooler. This change fixes the crash and
shows a user friendly error message.
bug:
17642690
Change-Id: I5a4acb06080a152562655da6851467b3e71d8658
Derek Sollenberger [Wed, 24 Sep 2014 20:21:53 +0000 (20:21 +0000)]
Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev
Dianne Hackborn [Wed, 24 Sep 2014 19:44:29 +0000 (12:44 -0700)]
Fix issue #
17614141: Add protection for accessing images
Add basic filename protection, also only file names that are for
app icons so this can't be abused to access thumbnails.
Change-Id: I2831c0f3f08a39aa734f93f76b6fd4aaf97e87c6
Mathieu Chartier [Wed, 24 Sep 2014 19:39:11 +0000 (19:39 +0000)]
am
a061388d: Merge "Fix dalvik map names" into lmp-dev
* commit '
a061388d3f230072661c55fcb4158f383fd9fe94':
Fix dalvik map names
George Mount [Wed, 24 Sep 2014 14:31:45 +0000 (07:31 -0700)]
Fix NPE when detached View is added as a shared element.
Bug
17632940
This won't solve all problems in which the parent becomes null,
but it will protect against shared elements being added that aren't
attached when mapped.
Change-Id: I991722c671c57048aea84b59a3c187c77c93450f
Mathieu Chartier [Wed, 24 Sep 2014 19:30:37 +0000 (19:30 +0000)]
Merge "Fix dalvik map names" into lmp-dev
Amith Yamasani [Tue, 23 Sep 2014 18:32:34 +0000 (11:32 -0700)]
Return masked location mode for managed profiles
If there's a user restriction on location sharing in a
managed profile, always return empty string for location
providers so that location can be disabled by the admin
even if the primary user has location enabled.
Also fix an incorrect update of the cache. Shouldn't update
the primary user's cache when the caller is the managed profile.
Bug:
17478855
Change-Id: Icab3459ae351c5cfc287e21df6a5ba1df9dfbdb4
Mathieu Chartier [Wed, 24 Sep 2014 00:24:30 +0000 (17:24 -0700)]
Fix dalvik map names
Some maps which should have been dalvik other were incorrectly
accounted for in dalvik heap.
Bug:
17632563
Change-Id: I90d0bebf700650a445b19c4c72674b2941868d8b
Chet Haase [Wed, 24 Sep 2014 18:41:06 +0000 (18:41 +0000)]
am
66287788: Merge "Avoid drawing the starting window twice" into lmp-dev
* commit '
66287788d35687a140df10ac96646cdf04f91a88':
Avoid drawing the starting window twice
Chet Haase [Wed, 24 Sep 2014 18:31:04 +0000 (18:31 +0000)]
Merge "Avoid drawing the starting window twice" into lmp-dev
Ruben Brunk [Wed, 24 Sep 2014 18:21:36 +0000 (18:21 +0000)]
am
b0069340: am
96cf7438: am
e9858c6a: Merge "camera2: Update CamcorderProfile documentation." into lmp-dev
* commit '
b0069340eb5c36a177f3d1140deaad1424f71087':
camera2: Update CamcorderProfile documentation.
Baligh Uddin [Wed, 24 Sep 2014 18:21:33 +0000 (18:21 +0000)]
am
b6954a4b: (-s ours) am
af1d623d: (-s ours) am
0f77230a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
b6954a4b9892a71de8572fafc42c10f1f71faa40':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Sep 2014 18:21:29 +0000 (18:21 +0000)]
am
2785a7c2: (-s ours) am
d763ec35: (-s ours) am
5de699d1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
2785a7c23b6d29e6488da10c55611389b045039f':
Import translations. DO NOT MERGE
Ruben Brunk [Wed, 24 Sep 2014 18:09:54 +0000 (18:09 +0000)]
am
96cf7438: am
e9858c6a: Merge "camera2: Update CamcorderProfile documentation." into lmp-dev
* commit '
96cf7438e380ae59e4d3973d866547bf5c9496e7':
camera2: Update CamcorderProfile documentation.
Baligh Uddin [Wed, 24 Sep 2014 18:09:51 +0000 (18:09 +0000)]
am
af1d623d: (-s ours) am
0f77230a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
af1d623d074328bf40a0c2e6199ea6ffe1f8935f':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Sep 2014 18:09:48 +0000 (18:09 +0000)]
am
d763ec35: (-s ours) am
5de699d1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
d763ec35079c683f2c39e524215a2c089ed37045':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Sep 2014 18:08:54 +0000 (18:08 +0000)]
am
2f1eb1b5: (-s ours) am
f4b606b6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
2f1eb1b51babf23146a7b33f42e1bb1982be82c2':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Sep 2014 18:08:50 +0000 (18:08 +0000)]
am
ec5d4aa1: (-s ours) am
a78321d7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
ec5d4aa1f7ed1a03747655438a60d21e9971d2e7':
Import translations. DO NOT MERGE
Ruben Brunk [Wed, 24 Sep 2014 17:58:35 +0000 (17:58 +0000)]
am
e9858c6a: Merge "camera2: Update CamcorderProfile documentation." into lmp-dev
* commit '
e9858c6a5aefe2aec45a89204fab34246ff4448a':
camera2: Update CamcorderProfile documentation.
Baligh Uddin [Wed, 24 Sep 2014 17:58:31 +0000 (17:58 +0000)]
am
0f77230a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
0f77230ab52f2a991dadc142bcc533093c55e463':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Sep 2014 17:58:27 +0000 (17:58 +0000)]
am
5de699d1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
5de699d1bc625e81f19c1c50916f8666f2da76da':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Sep 2014 17:57:55 +0000 (17:57 +0000)]
am
1bf1a02a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
1bf1a02ad05cb1fb2b489609d37104fe5aaba105':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Sep 2014 17:57:52 +0000 (17:57 +0000)]
am
8427b62b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
8427b62b2eb9770fe5769fe818aacd3349752aaa':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Sep 2014 17:57:17 +0000 (17:57 +0000)]
am
f4b606b6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
f4b606b60c971fac3c592537160057a71bb64962':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Sep 2014 17:57:13 +0000 (17:57 +0000)]
am
a78321d7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
a78321d7616ead50ee4d0fa66dee4a06b9e8a850':
Import translations. DO NOT MERGE
Dianne Hackborn [Wed, 24 Sep 2014 17:56:28 +0000 (10:56 -0700)]
Work on issue #
17624121: Settings crash while launching on wiped device
Cleaner paths and better error reporting when a problem goes wrong
while binding an application. This gets rid of the (recently added)
error about removing a process that hasn't been killed, and cleanly
kills the process along with more detailed errors about where things
failed.
Change-Id: I710a209c14da1515929e6254396b793177eee115
Ruben Brunk [Wed, 24 Sep 2014 17:54:16 +0000 (17:54 +0000)]
Merge "camera2: Update CamcorderProfile documentation." into lmp-dev
OSDN Git Service
