Wu-cheng Li
f87bc01766
am 774f1fca: am 753e1280: Merge "Unhide INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE." into jb-mr1-dev
...
* commit '774f1fca6fff5ba9ecd5a7db9548f6644cfaff27':
Unhide INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE.
2012-09-10 17:13:37 -07:00
Kenny Root
edf57b6cdd
am 008180c1: am be3267aa: Merge "Add a native library to test APKs" into jb-mr1-dev
...
* commit '008180c1d083bcff3dee0c86891bb71a82a6460d':
Add a native library to test APKs
2012-09-10 17:12:19 -07:00
Kenny Root
1bfaf5dc2b
am ce2a2ffc: am 785aaa2d: Merge "Add more testing for native libraries" into jb-mr1-dev
...
* commit 'ce2a2ffc6775581128cefaa99100097e555ea552':
Add more testing for native libraries
2012-09-10 17:12:15 -07:00
Dianne Hackborn
9e0709c6fb
am 1d0467ae: am 8727a731: Merge "A little cleanup." into jb-mr1-dev
...
* commit '1d0467ae1d7207c9a115241e17361442bb343f0f':
A little cleanup.
2012-09-10 17:12:02 -07:00
Kenny Root
8b919cbad5
am e671ef1b: am 25c925e6: Throw ALL the exceptions! (in the PackageManagerTests)
...
* commit 'e671ef1bf19033a44f16a66018d2b3f9374d039d':
Throw ALL the exceptions! (in the PackageManagerTests)
2012-09-10 17:11:34 -07:00
Jeff Brown
251193c05a
am fbb2da7a: am a3909a93: Work around crash when display is removed.
...
* commit 'fbb2da7a4d3588a9deea835e4b94d1c3547735e4':
Work around crash when display is removed.
2012-09-10 17:10:56 -07:00
Jeff Brown
496e48466f
am d07934db: am 20ec8ac5: Merge "Improve Wifi display discovery API." into jb-mr1-dev
...
* commit 'd07934dbc60d3f52c8133ae8249ef3d609ff2751':
Improve Wifi display discovery API.
2012-09-10 17:10:40 -07:00
Amith Yamasani
b69fc7b54c
am 46148f22: am 8f008e73: Merge "More multi-user methods in PM" into jb-mr1-dev
...
* commit '46148f22650e4e390a9488a2d31d0acd641eeffa':
More multi-user methods in PM
2012-09-10 17:10:32 -07:00
Jeff Brown
b61469c513
am de758bd0: am 1edf63ef: Merge "Enable auto-brightness adjustment feature with system prop." into jb-mr1-dev
...
* commit 'de758bd07df9bacb2c95ba9d00b3693b4e40b96b':
Enable auto-brightness adjustment feature with system prop.
2012-09-10 17:10:19 -07:00
Jeff Brown
b6e9976497
am fb7a8045: am b0d10aa9: Merge "Add new wifi display discovery API." into jb-mr1-dev
...
* commit 'fb7a80459206322468144029c06e38c084b35255':
Add new wifi display discovery API.
2012-09-10 17:10:14 -07:00
Jeff Brown
8d6a6be927
am 9fd7ce72: am f82b5836: Merge "Add permissions to control and configure wifi display." into jb-mr1-dev
...
* commit '9fd7ce728b613372307b9f2ec9f22412058c16e6':
Add permissions to control and configure wifi display.
2012-09-10 17:10:06 -07:00
Dianne Hackborn
234f00b9e8
am 789203ec: am 5d75052b: Merge "Add Binder.getCallingUserHandle()." into jb-mr1-dev
...
* commit '789203ec530e61f7678c9883a67135bf8cd3c679':
Add Binder.getCallingUserHandle().
2012-09-10 17:09:33 -07:00
Jim Miller
fcfa12a9ab
am 2e5e74f2: am ddb12e84: Merge "Enable lazy-loading of security views in keyguard" into jb-mr1-dev
...
* commit '2e5e74f2d38cb50a43c13a7b3fdedccadbac9fc6':
Enable lazy-loading of security views in keyguard
2012-09-10 17:09:28 -07:00
Jeff Brown
8eee7890c1
am 54b7362c: am 7017e483: Merge "Add support for Wifi display." into jb-mr1-dev
...
* commit '54b7362cd676e34a9492eba4b463d04b454b26d8':
Add support for Wifi display.
2012-09-10 17:08:33 -07:00
Nick Kralevich
93e62e2e18
am 4088457d: am cd620591: Merge "installd: fix forward locking symlink" into jb-mr1-dev
...
* commit '4088457d91ee4578369471e9d2ea127b799399bf':
installd: fix forward locking symlink
2012-09-10 17:08:30 -07:00
rich cannings
c491c1bf06
am d6870d9a: am 1275abd0: Merge "Move verification settings to Settings.Global" into jb-mr1-dev
...
* commit 'd6870d9a3d9a9104ae54abfbd2876206c180b925':
Move verification settings to Settings.Global
2012-09-10 17:08:26 -07:00
Chet Haase
be6665a933
am 39b72a7a: am 89b3f48f: Merge "Enable changing properties of layer paint" into jb-mr1-dev
...
* commit '39b72a7aaef1f7a5b7e43a6d0fe5a619b303fe66':
Enable changing properties of layer paint
2012-09-10 17:06:53 -07:00
Dianne Hackborn
3f6f96b526
am 00b7d2a0: am 649d0d71: Merge "More multi-user stuff:" into jb-mr1-dev
...
* commit '00b7d2a0de5d235f7eab721d4369bf93af512351':
More multi-user stuff:
2012-09-10 17:06:32 -07:00
Christopher Tate
06e6fb78ec
am 041aa46a: am 970683c5: Merge "Further fixup of migration to global settings" into jb-mr1-dev
...
* commit '041aa46a851f9e6d4e80b98f0c9cbe2ec89faec7':
Further fixup of migration to global settings
2012-09-10 17:06:00 -07:00
Teng-Hui Zhu
607caa925c
am f6cc1ddc: am 4db5d23d: Merge "Back key to dismiss full screen video" into jb-mr1-dev
...
* commit 'f6cc1ddc35d30a7314201011353840bd0aa8935b':
Back key to dismiss full screen video
2012-09-10 17:05:48 -07:00
Svetoslav Ganov
8d3d852243
am eef5dc63: am 390a06b8: Merge "Restore accessibility focus after ListView layout." into jb-mr1-dev
...
* commit 'eef5dc63d805f39eb0c68c93980a7ae728db3f7f':
Restore accessibility focus after ListView layout.
2012-09-10 17:05:06 -07:00
Romain Guy
d9d1721812
am 45aef365: am 6543c292: Merge "The drawables cache strikes again Bug #7117785 " into jb-mr1-dev
...
* commit '45aef365f6087e6cca6fce480e6230a9eb35aa6e':
The drawables cache strikes again Bug #7117785
2012-09-10 17:05:02 -07:00
Fabrice Di Meglio
24d9c9c9b3
am 8060ee1f: am f6aa537c: Merge "Make ProgressBar / SeekBar / RatingBar widgets aware of layout direction" into jb-mr1-dev
...
* commit '8060ee1f11a504da82ebe6ac63a3e741c023837c':
Make ProgressBar / SeekBar / RatingBar widgets aware of layout direction
2012-09-10 17:04:58 -07:00
Fabrice Di Meglio
113fce81d8
am c94106d7: am 01fcb728: Merge "Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resources" into jb-mr1-dev
...
* commit 'c94106d7c9b3bfe5591a1433440cb19d73a9fb5d':
Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resources
2012-09-10 17:04:53 -07:00
Wu-cheng Li
753e1280cb
Merge "Unhide INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE." into jb-mr1-dev
2012-09-10 00:48:26 -07:00
Kenny Root
be3267aad1
Merge "Add a native library to test APKs" into jb-mr1-dev
2012-09-09 15:18:35 -07:00
Kenny Root
785aaa2d19
Merge "Add more testing for native libraries" into jb-mr1-dev
2012-09-09 15:17:11 -07:00
Kenny Root
e64e097147
Add a native library to test APKs
...
In order to make sure we have unpacking and deletion working, add a fake
JNI library to every APK.
This can be expanded in the future to make sure replacement is working
correctly as well.
Change-Id: I1ad04c61df9518429aa17795b8a9d3608791cd8e
2012-09-09 15:12:16 -07:00
Kenny Root
7e921a157d
Add more testing for native libraries
...
Make sure that native library paths have the correct permissions and
owners. Also make it easier to do a "String#startsWith" test so we can
get better errors when it fails.
Change the observer to have more sane semantics with a CountDownLatch
instead of weird synchronization on a local variable.
Change-Id: I2437e5ea886d6e6cb8b4edeab80d6053b79857d4
2012-09-09 15:12:16 -07:00
Dianne Hackborn
8727a73127
Merge "A little cleanup." into jb-mr1-dev
2012-09-09 14:45:58 -07:00
Dianne Hackborn
1b8ecc5031
A little cleanup.
...
Change-Id: Ie33fd1b02011606e67ce08df3cce887c07680c60
2012-09-09 14:41:34 -07:00
Kenny Root
25c925e665
Throw ALL the exceptions! (in the PackageManagerTests)
...
Change all the test method headers to throw Exception so we don't have
to try to catch anything during the tests. Catching an exception might
mask an error during the tests.
Also fix a lot of formatting errors that have built up over the years.
This includes 3-space indentations instead of 4-space, missing spaces
between braces and parens, too-long lines, wrapping when it isn't
needed, etc.
Change-Id: Ifccea5f0706b6f9235f37974a5f80bee76c654dd
2012-09-09 12:32:03 -07:00
Jeff Brown
a3909a9395
Work around crash when display is removed.
...
After a display is removed, there may be a brief time
when a Context still exists that is bound to it.
We need to provide metrics in this case.
Bug: 7131637
Change-Id: I11b264a000653adbf0f3da399eaab66c4b40fb2a
2012-09-09 01:05:38 -07:00
Jeff Brown
20ec8ac586
Merge "Improve Wifi display discovery API." into jb-mr1-dev
2012-09-09 00:23:59 -07:00
Jeff Brown
180bbc7181
Improve Wifi display discovery API.
...
Change-Id: I4d46503e5413f52da16f79bbc9c631cc5ae9c178
2012-09-08 23:15:00 -07:00
Amith Yamasani
8f008e737a
Merge "More multi-user methods in PM" into jb-mr1-dev
2012-09-08 20:20:57 -07:00
Amith Yamasani
151ec4c9f8
More multi-user methods in PM
...
pm can list installed packages by user now.
Bug: 6926465
Change-Id: I822311bfd6e7e2d6fb315fc484739fbf953c9bb6
2012-09-08 19:14:00 -07:00
Geremy Condra
aaa8b0d50a
Merge "Add components for the Android Config Updater to system server."
2012-09-08 17:51:16 -07:00
Jeff Brown
1edf63ef4c
Merge "Enable auto-brightness adjustment feature with system prop." into jb-mr1-dev
2012-09-08 15:53:50 -07:00
Jeff Brown
631938f26d
Enable auto-brightness adjustment feature with system prop.
...
This feature is experimental and disabled by default.
Change-Id: I183534370da7613557e4d1535f556873f8a763df
2012-09-08 15:11:11 -07:00
Jeff Brown
b0d10aa983
Merge "Add new wifi display discovery API." into jb-mr1-dev
2012-09-08 14:55:02 -07:00
Jeff Brown
e08ae388d6
Add new wifi display discovery API.
...
The API is quite simple. There are a few extra functions
on DisplayManager to scan, connect and disconnect from
wifi displays and get status, and a single protected
broadcast sent when the status changes.
Change-Id: Ic91dbab5ee818e790b27fa32e1a1e93788793be0
2012-09-08 14:53:34 -07:00
Jeff Brown
f82b58368e
Merge "Add permissions to control and configure wifi display." into jb-mr1-dev
2012-09-08 14:51:55 -07:00
Dianne Hackborn
5d75052b2d
Merge "Add Binder.getCallingUserHandle()." into jb-mr1-dev
2012-09-07 18:35:02 -07:00
Dianne Hackborn
74ee8652e0
Add Binder.getCallingUserHandle().
...
Change-Id: I2a7eedfdc7baeeb4c2cd2ca0153aa95e0cf0bf45
2012-09-07 18:33:18 -07:00
Jim Miller
e46efc0460
Enable lazy-loading of security views in keyguard
...
This change removes all but the default KeyguardSelectorView from KeyguardViewHost
to (1) reduce the overall memory footprint (2) reduce initial layout inflation
time and (3) avoid initializing the camera until needed by face unlock.
Fixes bug 7127666
Change-Id: Ibac1838dd7a490dcadbfab5bdfdd82734b69055a
2012-09-07 18:07:59 -07:00
Jeff Brown
4b71e4e66c
Add permissions to control and configure wifi display.
...
Change-Id: I54af6da53b7243516becd6a3d5985c0feda6c225
2012-09-07 17:50:57 -07:00
Geremy Condra
1d4e1204ca
Add components for the Android Config Updater to system server.
...
This adds the necessary bits to verify and install configuration
updates using system server. It also includes the cert pinning
updater as the first user.
Change-Id: I42307f58074157b33b6e01216aab10022340d449
2012-09-07 16:50:11 -07:00
Jeff Brown
7017e48380
Merge "Add support for Wifi display." into jb-mr1-dev
2012-09-07 16:00:13 -07:00
Nick Kralevich
cd620591b7
Merge "installd: fix forward locking symlink" into jb-mr1-dev
2012-09-07 15:58:44 -07:00