Commit Graph

57548 Commits

Author SHA1 Message Date
Jorim Jaggi
00cd47a2d2 resolved conflicts for 0fb3f695 to master.
Change-Id: I679920313a872f8eb81cf00ffb6ffe037b8d0a3a
2015-09-09 18:40:05 -07:00
Jorim Jaggi
0fb3f695cc am 17076cc2: am 5a9bb951: resolved conflicts for 5d0e02b6 to cw-e-dev
* commit '17076cc262ff7e6b384bcb7354983c21ac33a8e9':
  Add double-tap power button to open camera 1/2
2015-09-10 01:06:47 +00:00
Jorim Jaggi
5a9bb9516d resolved conflicts for 5d0e02b6 to cw-e-dev
Change-Id: Id974d29581304dc644659d1c470b5413d847944b
2015-09-09 17:49:57 -07:00
Jorim Jaggi
c76925031d am 35a88c06: am f27035d9: am 131d541a: am 16093fe3: Revert "Disable fingerprint after force lock"
* commit '35a88c065e24248ff6036eb3c5a581a1a520f8fe':
  Revert "Disable fingerprint after force lock"
2015-09-10 00:29:11 +00:00
Jorim Jaggi
5d0e02b64e Merge "Add double-tap power button to open camera 1/2" into mnc-dr-dev 2015-09-10 00:25:59 +00:00
Jorim Jaggi
35a88c065e am f27035d9: am 131d541a: am 16093fe3: Revert "Disable fingerprint after force lock"
* commit 'f27035d9ee506e4f817ccd49ab60df541c25bbe7':
  Revert "Disable fingerprint after force lock"
2015-09-10 00:21:30 +00:00
Jorim Jaggi
131d541ae1 am 16093fe3: Revert "Disable fingerprint after force lock"
* commit '16093fe3f0d824731a53a264a132504deb08421a':
  Revert "Disable fingerprint after force lock"
2015-09-10 00:05:38 +00:00
Jorim Jaggi
16093fe3f0 Revert "Disable fingerprint after force lock"
Bug: 23827042
This reverts commit 0cb50efdc2.

Change-Id: I40251500b2dcf95e63ce39a768e11a50b26fb923
2015-09-10 00:00:29 +00:00
Adrian Roos
5941c98c64 Add double-tap power button to open camera 1/2
Bug: 23787555
Change-Id: I052b64748f155c59fbb649b32265f559423a8845
2015-09-09 16:57:14 -07:00
Jorim Jaggi
21bb7a3e38 am 463bf7cc: am 46154b8f: am b5304547: am 5e354223: Use AlarmManager for lockout reset
* commit '463bf7cc36660174166ad2aab7d1814bf35c8066':
  Use AlarmManager for lockout reset
2015-09-09 21:59:23 +00:00
Jorim Jaggi
463bf7cc36 am 46154b8f: am b5304547: am 5e354223: Use AlarmManager for lockout reset
* commit '46154b8fa50c4e8176225981500ad95a5b667cea':
  Use AlarmManager for lockout reset
2015-09-09 21:48:23 +00:00
Jorim Jaggi
b53045476c am 5e354223: Use AlarmManager for lockout reset
* commit '5e354223d817477efac9a6a2e3ce3d9161e046a4':
  Use AlarmManager for lockout reset
2015-09-09 20:54:42 +00:00
Jorim Jaggi
5e354223d8 Use AlarmManager for lockout reset
So the lockout reset exactly fires after 30 seconds, independent
of whether the device was in deep sleep.

Bug: 23668918
Change-Id: Idea1a877c395897c1fd075cf98edf41c8b1f4082
2015-09-09 20:41:11 +00:00
Nick Armstrong-Crews
3a5a8c741b Remove @hide for KEYCODE_SOFT_SLEEP.
Change-Id: I56a6da9faeafb26145e1d9ad82a16df46320c24e
2015-09-09 10:10:58 -07:00
Tao Bai
ab5bca1519 Merge "Load app resource as shared library." 2015-09-09 16:08:12 +00:00
Svetoslav Ganov
5f677b114c am 4f1bd159: am db4efcfa: am f57d9856: am 4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev
* commit '4f1bd159d9042106d112cbf579c2daf82842f375':
  Add get_accounts app op
2015-09-09 02:08:18 +00:00
Svetoslav Ganov
db4efcfa8d am f57d9856: am 4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev
* commit 'f57d98564b26953b722ab0e14222f50e6515f36d':
  Add get_accounts app op
2015-09-09 01:51:37 +00:00
Tao Bai
a6d7e3fb9c Load app resource as shared library.
- Added aapt command line flag --app-as-shared-lib to build app resources
  that could be loaded as shared lib at runtime.
- Added new method AssetManager.addAssetPathAsSharedLibrary() to load an
  app resource as shared library.

Bug 22487604

Change-Id: Ib9b33c35f9c2b7129f3ba205de03d4564623ea39
2015-09-08 18:48:42 -07:00
Svetoslav Ganov
f57d98564b am 4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev
* commit '4f7d0bc7af5fbb65796d24b130b7e9e63107bc5d':
  Add get_accounts app op
2015-09-09 01:42:56 +00:00
Lorenzo Colitti
51c61ee23a am fd183706: am 22262f31: am 0bc35668: am 017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev
* commit 'fd18370675f8794807747a18276dd7385e25f06e':
  Require the new PACKET_KEEPALIVE_OFFLOAD permission.
  Add an error code for generic hardware error.
  Fix bugs and crashes in PacketKeepalive API.
  Add tests for the PacketKeepalive API.
  Add a PACKET_KEEPALIVE_OFFLOAD permission.
  Use a CountDownLatch instead of sleep() in NetworkFactory tests.
  Get rid of shortSleep() in ConnectivityServiceTest.
  Make ConnectivityServiceTest a bit more readable.
2015-09-09 01:04:38 +00:00
Svetoslav
ce852ddcec Add get_accounts app op
For each runtime permission we have an app op to toggle the
permission for legacy apps as they cannot handle permission
revocations. We were lacking an app op for get_accounts
which prevented the user from controlling access to accounts
regardelss that they change the state of the permission
toggle in the UI. Even worse the permission UI is written
with the assumption that every runtime permission has an
app op and as a result revoking the contacts group (if the
app requests the get_accounts permission) is reset back to
allowed in the UI.

bug:23854618

Change-Id: I9e3f9bfeb320bed561d718db99ee285915d5701b
2015-09-08 17:54:37 -07:00
Lorenzo Colitti
fd18370675 am 22262f31: am 0bc35668: am 017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev
* commit '22262f31b964d595b56eb1277e4d88550a03e54c':
  Require the new PACKET_KEEPALIVE_OFFLOAD permission.
  Add an error code for generic hardware error.
  Fix bugs and crashes in PacketKeepalive API.
  Add tests for the PacketKeepalive API.
  Add a PACKET_KEEPALIVE_OFFLOAD permission.
  Use a CountDownLatch instead of sleep() in NetworkFactory tests.
  Get rid of shortSleep() in ConnectivityServiceTest.
  Make ConnectivityServiceTest a bit more readable.
2015-09-09 00:45:42 +00:00
Lorenzo Colitti
0bc356687e am 017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev
* commit '017223acda5bfe16cb87d0a33d72dd28d2fccd3b':
  Require the new PACKET_KEEPALIVE_OFFLOAD permission.
  Add an error code for generic hardware error.
  Fix bugs and crashes in PacketKeepalive API.
  Add tests for the PacketKeepalive API.
  Add a PACKET_KEEPALIVE_OFFLOAD permission.
  Use a CountDownLatch instead of sleep() in NetworkFactory tests.
  Get rid of shortSleep() in ConnectivityServiceTest.
  Make ConnectivityServiceTest a bit more readable.
2015-09-09 00:26:53 +00:00
Makoto Onuki
3adba7867a Merge "[split system] Tentatively support running DO on meat user" 2015-09-08 18:28:53 +00:00
Makoto Onuki
58b684f1cd [split system] Tentatively support running DO on meat user
- setDeviceOwner() now takes a user ID.  (We can infer it from Binder, but
we still need it for the dpm command.)

- Change broadcast target UID for DO to the DO user

- Start the DO user on boot complete.
TODO Investigate whether this is actually the good timing.

TODO Prevent the DO user from being killed

Bug 23827706

Change-Id: I227dbd444f1f4e94d98c317489d151554fe79d91
2015-09-08 11:24:58 -07:00
Lorenzo Colitti
9d1284eba7 Add an error code for generic hardware error.
This is necessary because currently the wifi code just returns
whatever hardware-specific integer it gets back from the HAL,
which is bad because that will be interpreted by the caller as
one of the error codes defined in this class.

In parallel we'll also modify the wifi code to return this new
error code if the hardware returns an error.

Bug: 21405946
Change-Id: Ic9fa1193ced69a4e7ff543e397221c89b10a5a13
2015-09-09 00:16:57 +09:00
Alan Viverette
c6c28731e5 Merge "Invalidate when Drawable.setState() returns true" 2015-09-08 14:08:19 +00:00
Lorenzo Colitti
ffa390b6f3 Use a CountDownLatch instead of sleep() in NetworkFactory tests.
This makes testNetworkFactoryRequests 2-3 times faster.

Bug: 22606153
Change-Id: I9657b6929e77f23ec811d0ab57b2ba974f0b6a69
2015-09-08 16:41:47 +09:00
Nick Armstrong-Crews
9fb0b5b12c am 13d2fa50: am 740cf71c: am 56ecfcce: Handle KEYCODE_SOFT_SLEEP from Ungaze.
* commit '13d2fa50b0815c63d2d289c27d8edacf1ace01eb':
  Handle KEYCODE_SOFT_SLEEP from Ungaze.
2015-09-08 05:38:30 +00:00
Nick Armstrong-Crews
13d2fa50b0 am 740cf71c: am 56ecfcce: Handle KEYCODE_SOFT_SLEEP from Ungaze.
* commit '740cf71c9978e5dcb0a68b6558531a52dc26d44f':
  Handle KEYCODE_SOFT_SLEEP from Ungaze.
2015-09-08 05:28:51 +00:00
Nick Armstrong-Crews
dc6aa5fc53 am d70377b5: am 36afc2b7: am 9b8f82a3: Merge "Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."" into cw-e-dev
* commit 'd70377b537450d03d5cdc2efb15977d48e5cfebd':
  Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."
2015-09-08 04:48:30 +00:00
Nick Armstrong-Crews
56ecfcce6c Handle KEYCODE_SOFT_SLEEP from Ungaze.
Needed for Ungaze to trigger "soft sleep" (respecting wake locks); operates by
sending new KEYCODE_SOFT_SLEEP to PhoneWindowManager, which calls
PowerManagerService's new method setUserInactiveOverride (thereby
causing immediate sleep, modulo wakelocks, upon next iteration of
PowerManagerService's main loop).

BUG: b/23589870
Change-Id: Iddafdde923605d119075e890eeda5d3fd3fd2bc7
2015-09-07 21:46:50 -07:00
Nick Armstrong-Crews
d70377b537 am 36afc2b7: am 9b8f82a3: Merge "Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."" into cw-e-dev
* commit '36afc2b76743b2b2803da20dc6a8b2142d1f9b17':
  Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."
2015-09-08 04:43:38 +00:00
Nick Armstrong-Crews
9b8f82a3a0 Merge "Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."" into cw-e-dev 2015-09-08 04:28:07 +00:00
Nick Armstrong-Crews
b331bf9514 Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."
This reverts commit 677adf1e66.

Hiding new keycode to prevent change to public API before resubmitting.

Change-Id: Ic43273dd0c7ade1d51a36b77f363543f1df466e8
2015-09-08 04:25:01 +00:00
Robert Greenwalt
519026ff4a am a59ee3ac: am 597c55b5: am e686d9b3: am 8e285f2f: Merge "Cut down some logs." into mnc-dr-dev
* commit 'a59ee3ac094d9d2a1c38852bc824d20f8166e28a':
  Cut down some logs.
2015-09-06 23:08:25 +00:00
Robert Greenwalt
a59ee3ac09 am 597c55b5: am e686d9b3: am 8e285f2f: Merge "Cut down some logs." into mnc-dr-dev
* commit '597c55b5790f2bbc86cd2333a71a934bf351fa3c':
  Cut down some logs.
2015-09-04 22:27:45 +00:00
Robert Greenwalt
e686d9b3aa am 8e285f2f: Merge "Cut down some logs." into mnc-dr-dev
* commit '8e285f2f74460b1b4bc9ba0faa3c94540f5ab92c':
  Cut down some logs.
2015-09-04 22:06:00 +00:00
Alan Viverette
9ed62e47c9 Merge "Deprecate FEATURE_PROGRESS and related methods" 2015-09-04 19:16:33 +00:00
Vadim Tryshev
131e8faa97 Merge "Implementing app-centric Shelf." 2015-09-04 18:48:55 +00:00
Nick Armstrong-Crews
e097d341a4 am 7f37402d: am 43c4459d: am 6f0ba402: Merge "Handle KEYCODE_SOFT_SLEEP from Ungaze." into cw-e-dev
* commit '7f37402d8c5667f72c1ef02a20112d49d7a149b8':
  Handle KEYCODE_SOFT_SLEEP from Ungaze.
2015-09-04 18:35:23 +00:00
Nick Armstrong-Crews
7f37402d8c am 43c4459d: am 6f0ba402: Merge "Handle KEYCODE_SOFT_SLEEP from Ungaze." into cw-e-dev
* commit '43c4459d995ce7a723d92945a7e4ccb81d48e224':
  Handle KEYCODE_SOFT_SLEEP from Ungaze.
2015-09-04 18:22:54 +00:00
Alan Viverette
4aef7c8594 Deprecate FEATURE_PROGRESS and related methods
Bug: 23763003
Change-Id: I4ef97e089db592e438a27657faffa1c8290f2b0e
2015-09-04 14:14:50 -04:00
Nick Armstrong-Crews
6f0ba40224 Merge "Handle KEYCODE_SOFT_SLEEP from Ungaze." into cw-e-dev 2015-09-04 18:04:12 +00:00
Vadim Tryshev
3560575009 Implementing app-centric Shelf.
We finally get a UX decision for the Shelf.
Shelf won't have 2 parts - pinned and recents; it will have only 1 list where
all pinned and recent activities of the same kind are grouped under a single icon.
Clicking at that icon activates the latest running activity if it's present, or
starts a new one otherwise.

The above part is implemented in this CL. I removed stuff related to the separate
Recents pane, and moved surviving code to NavigationBarApps.

Later, we'll have menus popping up from the icon, which will allow pinning and unpinning,
and choosing a concrete activity to activate.

Bug: 20024603
Change-Id: Ia08fe62939f92c7ee4f102c07a31e7168a11f010
2015-09-04 11:02:35 -07:00
Nick Armstrong-Crews
677adf1e66 Handle KEYCODE_SOFT_SLEEP from Ungaze.
Needed for Ungaze to trigger "soft sleep" (respecting wake locks); operates by
sending new KEYCODE_SOFT_SLEEP to PhoneWindowManager, which calls
PowerManagerService's new method setUserInactiveOverride (thereby
causing immediate sleep, modulo wakelocks, upon next iteration of
PowerManagerService's main loop).

BUG: b/23589870
Change-Id: I24a96bd6db8ff28674c907f2898e49c4f6140209
2015-09-04 10:20:22 -07:00
Yasuhiro Matsuda
f9fba98025 am e651ee9b: am 10191dd9: am 53f1a815: Merge "Remove unnecessary finally blocks for tracing."
* commit 'e651ee9bef73c00c3ca1f1ed57485a6c06b802fd':
  Remove unnecessary finally blocks for tracing.
2015-09-04 14:28:49 +00:00
Dan Stoza
4b4d29a6fa am 8dcd14cd: am 4a90942e: am f615872c: am 0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev
* commit '8dcd14cdc95a5b71597fa428b9c2a45c3a86944c':
  SurfaceControl: Add colorTransform to DisplayInfo
2015-09-04 14:28:31 +00:00
Alan Viverette
ad0020f807 Invalidate when Drawable.setState() returns true
Ensures views that manage drawables follow the contract set forth in
the Drawable.setState() documentation.

Bug: 23792020
Change-Id: I4e5a449cd6535487873fd8443da50555c38e8ed9
2015-09-04 10:10:42 -04:00
Yasuhiro Matsuda
e651ee9bef am 10191dd9: am 53f1a815: Merge "Remove unnecessary finally blocks for tracing."
* commit '10191dd9d20f589fd6f7868a350c104372a57687':
  Remove unnecessary finally blocks for tracing.
2015-09-04 02:47:52 +00:00