Jerry Zhang
fba74d6c61
Merge changes from topic 'svcusb' am: 5e2a2ee39e am: 6f44072d03
...
am: 35f8d6cfd0
2017-02-17 02:24:44 +00:00
Jerry Zhang
35f8d6cfd0
Merge changes from topic 'svcusb' am: 5e2a2ee39e
...
am: 6f44072d03
2017-02-17 02:16:11 +00:00
Philip P. Moltmann
30a2d638c0
Allow the shell to set USB functions.
...
Bug: 25596495
Test: Issed a shell command and saw it handled correctly
Change-Id: I4472464a1c7ed100cb257dbad83d1d8cfef88fc6
2017-02-16 13:14:50 -08:00
Paul Duffin
43267b4b9e
Merge "Prepare for removal of legacy-test from default targets" am: c74ccf1588 am: ab62fd67d8
...
am: 56a2ae1056
2017-01-19 11:49:28 +00:00
Paul Duffin
56a2ae1056
Merge "Prepare for removal of legacy-test from default targets" am: c74ccf1588
...
am: ab62fd67d8
2017-01-19 11:44:56 +00:00
Paul Duffin
ccb0445027
Prepare for removal of legacy-test from default targets
...
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.
(cherry picked from 6387604f9e672ece85e07c4bcbd7be396867f06f)
Bug: 30188076
Test: make checkbuild
Merged-In: I13e88297731253420e4e5f5291d503f13a39a156
Change-Id: I58446eb8c45d8ac2bcdbc9fa40d1321e811bdd4b
2017-01-19 09:43:05 +00:00
Tamas Berghammer
24d8553316
DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
...
This reverts commit cbd3f0c59a
2017-01-18 19:33:22 +00:00
Tamas Berghammer
cbd3f0c59a
Update package names to work with the proto3 compiler
...
Bug: b/28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
(cherry picked from commit 383db5ebcc
2017-01-11 11:27:38 +00:00
Baligh Uddin
b1df48d326
Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger
...
Bug: 32849428
* goog/cw-f-dev: (98 commits)
Revert "Catch KeyStoreException for setting profile lock"
Fix createConfirmDeviceCredentialIntent for wear for CTS.
Fix default dialog background colour for watch devices.
Catch KeyStoreException for setting profile lock
Add cross-links between FINE and COARSE location permissions. bug: 25371600
Fixed a bug with the emergency affordance in multi user
Zygote: Additional whitelists for runtime overlay / other static resources.
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Zygote : Block SIGCHLD during fork.
colors: add missing accent_material_{700,50} resources.
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Zygote : Block SIGCHLD during fork.
DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"
...
Change-Id: I63468da5bfa21ed9ac5985bbdbf3a61d4c389aa0
2016-11-22 17:19:45 -08:00
Bill Yi
5e7d7e48f0
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 32177112
Change-Id: Iad7637d1a9f10f5641f089db9542734be4da0d2e
2016-11-20 14:18:34 -08:00
Bill Yi
b8aaaa8949
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 32766034
Change-Id: Iedf58d553e92d709ee8e7b4c7423d7e5a13a4996
2016-11-10 20:49:23 -08:00
Wei Liu
973a07c87e
Allow shell to acquire wakelock.
...
am: 6e500010b1
2016-09-22 19:01:42 +00:00
Wei Liu
6e500010b1
Allow shell to acquire wakelock.
...
b/30832947
Change-Id: I348ab5642ca625b4700ec63f72414729d574da5e
2016-09-13 16:28:45 -07:00
Ben Lin
b01be62d58
Push delete notification when Bug reports are deleted. am: 86805aa3af
...
am: 64146c5d24
2016-08-30 02:24:20 +00:00
Ben Lin
64146c5d24
Push delete notification when Bug reports are deleted.
...
am: 86805aa3af
2016-08-29 23:01:30 +00:00
Ben Lin
86805aa3af
Push delete notification when Bug reports are deleted.
...
Bug: 28768706
Change-Id: I6d3e91fe7d12be44918f97cef12c99d936401270
2016-08-29 14:08:32 -07:00
Allen Hair
8b931e08d0
Configure code coverage filters. am: 02fd609460
...
am: 15b70213a4
2016-08-26 17:41:11 +00:00
Allen Hair
15b70213a4
Configure code coverage filters.
...
am: 02fd609460
2016-08-26 17:33:35 +00:00
Allen Hair
02fd609460
Configure code coverage filters.
...
Bug: 28269038
Change-Id: If4dfb769d543e70faea7200dc1da15c50a83270f
2016-08-25 17:28:03 -07:00
Felipe Leme
9fd057775d
Fixed year on copyright notice. am: 6dd4e88210
...
am: 3a41597e35
2016-08-04 20:04:42 +00:00
Felipe Leme
6dd4e88210
Fixed year on copyright notice.
...
BUG: 30429392
Change-Id: If6477ccde5820dd118ad92bb5d4f74d938cf0d83
2016-08-03 10:05:54 -07:00
Felipe Leme
8cfc23f434
Use SurfaceControl.screenshot() instead of screencap for screenshots. am: aba9743643
...
am: ce61b5715d
2016-08-02 18:50:43 +00:00
Felipe Leme
ce61b5715d
Use SurfaceControl.screenshot() instead of screencap for screenshots.
...
am: aba9743643
2016-08-02 18:37:48 +00:00
TreeHugger Robot
f7ac45a33b
Merge "Use SurfaceControl.screenshot() instead of screencap for screenshots." into nyc-mr1-dev
2016-08-02 18:29:46 +00:00
Bill Yi
f0f669876e
Import translations. DO NOT MERGE
...
Change-Id: Ie3bc5cbcb9b7c6fad8aee616dc8b75e97353c834
Auto-generated-cl: translation import
2016-08-01 23:55:40 -07:00
Bill Yi
8806c6d033
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 30476613
Change-Id: I7e23bac276a7029a1f35b3b98e238d46e19e50fe
2016-08-01 13:06:59 -07:00
Felipe Leme
aba9743643
Use SurfaceControl.screenshot() instead of screencap for screenshots.
...
Change-Id: I5a9e7bbc5f3ae176ac5ae7209a133526992e92d4
Fixes: 30429392
2016-07-28 17:31:45 -07:00
Bill Yi
9d1117531d
Import translations. DO NOT MERGE
...
Change-Id: I27c1e473ca98bdc216d7bdf8d8d2f1838fa1c728
Auto-generated-cl: translation import
2016-07-25 04:23:39 -07:00
Bill Yi
4e6749a30e
Import translations. DO NOT MERGE
...
Change-Id: I2e524908704b38120b77928886da6eda38ede052
Auto-generated-cl: translation import
2016-07-20 14:56:13 -07:00
Wei Liu
bc3c068189
Merge \"Use the Shell app to show the bugreport notification on Wear.\" into nyc-mr1-dev
...
am: 1dfbf794b5
2016-07-19 17:22:30 +00:00
Wei Liu
1dfbf794b5
Merge "Use the Shell app to show the bugreport notification on Wear." into nyc-mr1-dev
2016-07-19 17:16:23 +00:00
Andrew Sapperstein
b88c3801ea
Merge \"Update bugreport dialog to DeviceDefault theme.\" into nyc-mr1-dev
...
am: 878bd5103e
2016-07-19 02:11:05 +00:00
TreeHugger Robot
878bd5103e
Merge "Update bugreport dialog to DeviceDefault theme." into nyc-mr1-dev
2016-07-19 02:03:55 +00:00
Andrew Sapperstein
59b5679730
Update bugreport dialog to DeviceDefault theme.
...
By using DeviceDefault instead of Material, this UI is now
resilient to any platform-level theme changes.
Change-Id: I43ce61b36f4c089ee07f754088abe2dfe6700877
Fixes: 30173174
2016-07-18 17:19:15 -07:00
Wei Liu
9f35541760
Use the Shell app to show the bugreport notification on Wear.
...
b/30041885
Change-Id: I998aa1606eb12f74a407fbafd9abc11c9454fb66
2016-07-18 13:56:25 -07:00
Felipe Leme
a49813ded6
Merge \"Fixed bugreport share dialog padding.\" into nyc-mr1-dev
...
am: 699e1bc74b
2016-07-18 18:53:04 +00:00
Felipe Leme
e26cc5d5f3
Fixed bugreport share dialog padding.
...
Change-Id: Id7848770c6410eda7b6272acb981ef5c3afbeaec
Fixes: 30055508
2016-07-12 17:00:05 -07:00
Sudheer Shanka
0979d718c5
Merge \"Reduce shell power over user management.\" into nyc-dev
...
am: 1b4124fc95
2016-06-10 21:39:33 +00:00
Sudheer Shanka
a2ef5c89c0
Merge \"Reduce shell power over user management.\" into nyc-dev
...
am: 1b4124fc95
2016-06-10 21:39:22 +00:00
Sudheer Shanka
f5cea03eb0
Reduce shell power over user management.
...
Remove MANAGE_USERS permission from shell and whitelist it for
some specific functionality.
Bug: 29189712
Change-Id: Ifb37448c091af91991964511e3efb1bb4dea1ff3
2016-06-10 13:05:18 -07:00
Ben Lin
6d80e074ec
Merge "Register change Uri and notify changes in bugreportServices." into nyc-dev
...
am: 5d5ddfa80e
2016-05-24 18:01:34 +00:00
Ben Lin
9c14d14f43
Merge "Register change Uri and notify changes in bugreportServices." into nyc-dev
...
am: 5d5ddfa80e
2016-05-24 18:01:16 +00:00
Ben Lin
c6905cfb11
Register change Uri and notify changes in bugreportServices.
...
Bug: 28767380
Change-Id: Ia4d1f5a2e44881d300f2869c628d4990406caf40
(cherry picked from commit 6c9ff513c6d7d3de7ab8920d88111c2b1dc1bb1f)
(cherry picked from commit 93fafd67a6
2016-05-23 20:07:04 +00:00
Amith Yamasani
9db4384118
Merge "Allow Shell to change component enabled state" into nyc-dev
...
am: 19b34eccfe
2016-05-17 00:34:30 +00:00
Amith Yamasani
0250ae2c1b
Merge "Allow Shell to change component enabled state" into nyc-dev
...
am: 19b34eccfe
2016-05-17 00:34:16 +00:00
Amith Yamasani
bf12565276
Allow Shell to change component enabled state
...
But make sure that we don't allow Shell or other apps
to disable an active profile or device owner.
Also limit exactly what states Shell can switch apps
between, similar to Settings UI.
This is required for some CTS tests
Bug: 27924655
Change-Id: I958f0d1de7f0bc1f5a0cbf853d57dfdeb2f9ad59
2016-05-16 15:17:50 -07:00
Steve McKay
554faa0897
Merge "Add archive support to Bug report docs provider." into nyc-dev
...
am: dbe2dbae99
2016-05-02 20:29:46 +00:00
Steve McKay
f176a29d8f
Merge "Add archive support to Bug report docs provider." into nyc-dev
...
am: dbe2dbae99
2016-05-02 20:29:42 +00:00
Steve McKay
53a528bb4f
Add archive support to Bug report docs provider.
...
Bug: 28386918
Change-Id: I2270324be3f020d73a68151002f885f70eb1449c
2016-04-27 16:46:16 -07:00
Bill Yi
d983af0417
Import translations. DO NOT MERGE
...
Change-Id: I4020df44a4ff061fd5a9d560a1340aee6f05351f
Auto-generated-cl: translation import
2016-04-27 06:13:08 -07:00
