Commit Graph

58478 Commits

Author SHA1 Message Date
Robin Lee
34afb60a8d Merge "Internal API for system apps to determine default network for other apps" into nyc-dev am: 1b83651
am: a948f88

* commit 'a948f8872aa045ab22f42285f195fdb413c5ff66':
  Internal API for system apps to determine default network for other apps

Change-Id: Ib719f0cebb41afe4aa52241f3797598a7e468d2d
2016-04-07 16:51:53 +00:00
Phil Weaver
9711357736 Merge "Allow tests to change UiAutomation flags." into nyc-dev am: d408b99
am: 8c1e665

* commit '8c1e665bc58e6c883f0f5a939dbb777da383ce96':
  Allow tests to change UiAutomation flags.

Change-Id: Ibd6faa5f061ff88dc09310bf36b7f2a10212a8f1
2016-04-07 16:51:49 +00:00
Robin Lee
a948f8872a Merge "Internal API for system apps to determine default network for other apps" into nyc-dev
am: 1b83651

* commit '1b83651e7fca620589a6317d3a8559e43a19485c':
  Internal API for system apps to determine default network for other apps

Change-Id: Ia928e2621e61946cdfa70ea186e9a00036dec4de
2016-04-07 16:48:05 +00:00
Phil Weaver
8c1e665bc5 Merge "Allow tests to change UiAutomation flags." into nyc-dev
am: d408b99

* commit 'd408b995c32710f8306af83c13cccdfa70cca242':
  Allow tests to change UiAutomation flags.

Change-Id: I2b59047a63905fd8c41e08d6aa140be10c463de9
2016-04-07 16:48:01 +00:00
Robin Lee
1b83651e7f Merge "Internal API for system apps to determine default network for other apps" into nyc-dev 2016-04-07 16:43:15 +00:00
Phil Weaver
d408b995c3 Merge "Allow tests to change UiAutomation flags." into nyc-dev 2016-04-07 16:35:27 +00:00
Ricky Wai
d48a049fa3 Merge "Fix work profile screen timeout policy" into nyc-dev am: bdc3961
am: 869ecf2

* commit '869ecf225a6c6adb5d5dfe738e6d24ee0f41b1e7':
  Fix work profile screen timeout policy

Change-Id: I9664923b282f7b19f7a5a780977dedafa763d343
2016-04-07 16:31:23 +00:00
Ricky Wai
869ecf225a Merge "Fix work profile screen timeout policy" into nyc-dev
am: bdc3961

* commit 'bdc3961fef7b57f98bd6091b79fb511081237d8e':
  Fix work profile screen timeout policy

Change-Id: I4ebf3e47cfadcfe3f689e28f2a487c384278fb83
2016-04-07 16:28:00 +00:00
Ricky Wai
035e924470 Fix work profile screen timeout policy
Settings screen should apply both primary and managed maximum
timeout policy, even separate profile challenge is enabled.

Bug: 27493348
Change-Id: Ia1ec1cafc7665c54816833af64e0f446a77a55b2
2016-04-07 17:16:03 +01:00
Ricky Wai
a2438d1f67 Delete all work fingerprints when unified lock changes to None/Swipe am: f86f986
am: c5de901

* commit 'c5de9018b2a76b2df1b30833bade5cb57245f350':
  Delete all work fingerprints when unified lock changes to None/Swipe

Change-Id: I3d0e64e419afcfccdb27d859480d12eac70803c4
2016-04-07 15:53:31 +00:00
Ricky Wai
c5de9018b2 Delete all work fingerprints when unified lock changes to None/Swipe
am: f86f986

* commit 'f86f986728b5844a48e2e7bbd4927d2f5500c682':
  Delete all work fingerprints when unified lock changes to None/Swipe

Change-Id: I683d05a106119af74fe920b37be4e26e158e5cbc
2016-04-07 15:50:06 +00:00
Ricky Wai
f86f986728 Delete all work fingerprints when unified lock changes to None/Swipe
Bug: 27551139
Change-Id: Ida398a922d9c42e65001b0a10e13552505824d2d
2016-04-07 15:40:54 +00:00
Robin Lee
d2baf792f8 Internal API for system apps to determine default network for other apps
Callers with CONNECTIVITY_INTERNAL permission can read off the netId
that an application is assigned to by default.

Necessary for making connections as the default network for a client
app eg. when downloading stuff on its behalf.

Bug: 27074270
Change-Id: I8d35e8e99126875f55f3c545090326f3e9be43fb
2016-04-07 14:55:59 +00:00
Ashutosh Joshi
d0cb6cecdb Merge "Add dumpsys capabilities for context hub service" into nyc-dev am: 7d4a7fa
am: 0174e54

* commit '0174e54e8c2b1432be41dff4029adbb49fafcecb':
  Add dumpsys capabilities for context hub service

Change-Id: I293b86e31d5f54c37eb60fefee9ed9dc4bd9c0ee
2016-04-07 14:09:36 +00:00
Ashutosh Joshi
0174e54e8c Merge "Add dumpsys capabilities for context hub service" into nyc-dev
am: 7d4a7fa

* commit '7d4a7fa333c4d73ed36d3729b43a5f3ae82cdc93':
  Add dumpsys capabilities for context hub service

Change-Id: Iabe5f35caa73bdb8beccc6d5e3596a0478a62266
2016-04-07 14:06:16 +00:00
Alexander Hills
e9765a3c3a Merge "Adds a content-intent-launching-activity flag to WearableExtender" into nyc-dev am: a5ec16e
am: 9f1e6de

* commit '9f1e6de054f836e3b35bb96998c1400435cd5d7a':
  Adds a content-intent-launching-activity flag to WearableExtender

Change-Id: If09863a35440db6b0fc10c021226c9b61b52283f
2016-04-07 14:03:06 +00:00
Ashutosh Joshi
7d4a7fa333 Merge "Add dumpsys capabilities for context hub service" into nyc-dev 2016-04-07 14:00:49 +00:00
Alex Hills
9f1e6de054 Merge "Adds a content-intent-launching-activity flag to WearableExtender" into nyc-dev
am: a5ec16e

* commit 'a5ec16e367637ba0638f906615cbfef6f4d85d13':
  Adds a content-intent-launching-activity flag to WearableExtender

Change-Id: I7af69f8e647d055a2ee9e0ac66aec7d9ee140f0b
2016-04-07 13:59:56 +00:00
Alexander Hills
a5ec16e367 Merge "Adds a content-intent-launching-activity flag to WearableExtender" into nyc-dev 2016-04-07 13:52:58 +00:00
Seigo Nonaka
6245395c04 Merge "Fix suggestion popup for RTL text on LTR layout." into nyc-dev am: 64d1515
am: a0d2425

* commit 'a0d242572e1cf2ded145edeb9d6d8d331cf46fc8':
  Fix suggestion popup for RTL text on LTR layout.

Change-Id: I00b52e18af2faf00c987fe6414c944f2f96e0be7
2016-04-07 09:31:10 +00:00
Seigo Nonaka
a0d242572e Merge "Fix suggestion popup for RTL text on LTR layout." into nyc-dev
am: 64d1515

* commit '64d151507601a6472f85c96d105e2555b7ad221f':
  Fix suggestion popup for RTL text on LTR layout.

Change-Id: I5c2a98e6d7a55c463ec1aea00729d70294aa0e29
2016-04-07 09:27:45 +00:00
Seigo Nonaka
64d1515076 Merge "Fix suggestion popup for RTL text on LTR layout." into nyc-dev 2016-04-07 09:20:27 +00:00
Seigo Nonaka
1d3efb6f64 Fix suggestion popup for RTL text on LTR layout.
By setting width to the ListView, the width of the containing text view
won't match with parent.

I locally verified this doesn't revive issue 27341560.

Bug: 28034210

Change-Id: I67886a752ef110d3433dddd6aa8447a9027f8e19
2016-04-07 16:40:57 +09:00
Jeff Sharkey
6e7b36be09 Merge "Automatically trace messages on shared loopers." into nyc-dev am: 94cac07
am: 0deeb85

* commit '0deeb857d33ddac502737665f3745f97bb62b977':
  Automatically trace messages on shared loopers.

Change-Id: I1dcb0aaa0a3adda17c0b14d4af27999b1b888e93
2016-04-07 07:29:23 +00:00
Jeff Sharkey
0deeb857d3 Merge "Automatically trace messages on shared loopers." into nyc-dev
am: 94cac07

* commit '94cac0730a23525559ded53bfaaee5a529b80aab':
  Automatically trace messages on shared loopers.

Change-Id: Ifbc34c8d15b23ca55782ecee0973e36f33441c72
2016-04-07 07:26:28 +00:00
Jeff Sharkey
94cac0730a Merge "Automatically trace messages on shared loopers." into nyc-dev 2016-04-07 07:19:03 +00:00
Jeff Sharkey
74cd3de6f4 Automatically trace messages on shared loopers.
There are a handful of looper threads in the system_process that
are shared by dozens of different internal services.  To help track
down what these operations are, tag the processing of each message
with a string that tries describing where it originated from: the
class name of the Handler, and the message number or class name of the
Runnable.

Bug: 28046299
Change-Id: I409ec43fea8daaae4fd70df05d4fed929a7249ae
2016-04-07 00:14:53 -06:00
Keisuke Kuroyanagi
0ba6c1acb2 Merge "Invalidate HandleView when handle position may have to be changed." into nyc-dev am: 03f1e02
am: d73e1e3

* commit 'd73e1e35bff5bc47ae4d53f8637af95e82008dc3':
  Invalidate HandleView when handle position may have to be changed.

Change-Id: I6ff347a06534650db39f162c7cfe06cd491e1077
2016-04-07 05:31:21 +00:00
Keisuke Kuroyanagi
d73e1e35bf Merge "Invalidate HandleView when handle position may have to be changed." into nyc-dev
am: 03f1e02

* commit '03f1e026996a7665aefcda947ed97faae009735e':
  Invalidate HandleView when handle position may have to be changed.

Change-Id: Ida7d9b65486177b28071c6ab7ca09d8085c4ed59
2016-04-07 05:28:31 +00:00
Keisuke Kuroyanagi
03f1e02699 Merge "Invalidate HandleView when handle position may have to be changed." into nyc-dev 2016-04-07 05:22:36 +00:00
Ashutosh Joshi
6239cc6fe1 Add dumpsys capabilities for context hub service
Add useful debug hook for context hub service.
Fix constants
Use helper functions to address OS

Change-Id: Iba5f24a9a1fd809c3d83752953389d373ff334ca
2016-04-06 21:21:34 -07:00
Andrii Kulian
6d1a8c6edc Merge "Caps Lock toggle with Meta + Alt (2/2)" into nyc-dev am: 48143f7
am: 943adfd

* commit '943adfd073812d0b71f6cc5706e64d345cee99ac':
  Caps Lock toggle with Meta + Alt (2/2)

Change-Id: Ia25ffb49e13ed3ce623fcbc5bb8e5bce022a5a5d
2016-04-07 01:53:48 +00:00
Andrii Kulian
943adfd073 Merge "Caps Lock toggle with Meta + Alt (2/2)" into nyc-dev
am: 48143f7

* commit '48143f7ec58f2793e236566e0d25d3b731858996':
  Caps Lock toggle with Meta + Alt (2/2)

Change-Id: I0015cf2138c3830e2d8e043759efd4ed15cd7701
2016-04-07 01:51:00 +00:00
Andrii Kulian
48143f7ec5 Merge "Caps Lock toggle with Meta + Alt (2/2)" into nyc-dev 2016-04-07 01:43:03 +00:00
Alan Viverette
379bd8afac Merge "Deprecate methods not supported by Material-style date picker" into nyc-dev am: b2df6af
am: 106d380

* commit '106d380ae98c80fe25130be1286479258515503e':
  Deprecate methods not supported by Material-style date picker

Change-Id: I1973884a036352f02269e0ecd366cee0edc5e2b0
2016-04-06 23:00:24 +00:00
Alan Viverette
106d380ae9 Merge "Deprecate methods not supported by Material-style date picker" into nyc-dev
am: b2df6af

* commit 'b2df6af902609cf43336521c9b68123a031a00a3':
  Deprecate methods not supported by Material-style date picker

Change-Id: I0f4ba10f785aa28a3b21f2f1ec39a1d1350ca2dd
2016-04-06 22:57:15 +00:00
Andreas Gampe
1de67c4dc1 Merge "Frameworks/base: Move Animation.USE_CLOSEGUARD to inner class" into nyc-dev am: 12a722e
am: 1fdbd81

* commit '1fdbd81b4114bd886f4a01c06a316e24ac173f91':
  Frameworks/base: Move Animation.USE_CLOSEGUARD to inner class

Change-Id: I48a810edda0c84292b2d641ceb20aba4fa7993e5
2016-04-06 22:52:24 +00:00
Andreas Gampe
1fdbd81b41 Merge "Frameworks/base: Move Animation.USE_CLOSEGUARD to inner class" into nyc-dev
am: 12a722e

* commit '12a722e56936853c880a20026057020d2a4252dc':
  Frameworks/base: Move Animation.USE_CLOSEGUARD to inner class

Change-Id: If7e9b2c84c4d49a565bda3abe308df6b43f64acd
2016-04-06 22:49:46 +00:00
Alan Viverette
b2df6af902 Merge "Deprecate methods not supported by Material-style date picker" into nyc-dev 2016-04-06 22:49:44 +00:00
Andreas Gampe
12a722e569 Merge "Frameworks/base: Move Animation.USE_CLOSEGUARD to inner class" into nyc-dev 2016-04-06 22:45:36 +00:00
Ruben Brunk
4a49791ef9 Merge "Add VrManager AIDL interface for use by system apps." into nyc-dev am: 50e229f
am: bc783e0

* commit 'bc783e038c17524c5182ad6b5e17ba95d0e1a319':
  Add VrManager AIDL interface for use by system apps.

Change-Id: Ie3aaad8ef509f69c643638f8974a95e1f33a7a60
2016-04-06 21:44:55 +00:00
Ruben Brunk
bc783e038c Merge "Add VrManager AIDL interface for use by system apps." into nyc-dev
am: 50e229f

* commit '50e229f1f45a1550ba13ec3f81e864630fc3dc1c':
  Add VrManager AIDL interface for use by system apps.

Change-Id: Ia0bbf2bbe778bef5773e5d7c43b25d3cb248fe23
2016-04-06 21:42:17 +00:00
Jeff Sharkey
b5158afe6c Merge "Remove old FUSE bypass now that we have sdcardfs." into nyc-dev am: fd1bb10
am: edd2e60

* commit 'edd2e60ae343d15304415489ee752527220b5ac1':
  Remove old FUSE bypass now that we have sdcardfs.

Change-Id: Ibd1a63bd1f8ce72ea650bbd0a972314e90e3f7af
2016-04-06 21:37:42 +00:00
Ruben Brunk
50e229f1f4 Merge "Add VrManager AIDL interface for use by system apps." into nyc-dev 2016-04-06 21:36:53 +00:00
Jeff Sharkey
edd2e60ae3 Merge "Remove old FUSE bypass now that we have sdcardfs." into nyc-dev
am: fd1bb10

* commit 'fd1bb10753c1f8b2de269cc6c1525cd3cfebc1e7':
  Remove old FUSE bypass now that we have sdcardfs.

Change-Id: Id15054a1e91b0ca107006b8a0b61a90ba98a1f4a
2016-04-06 21:34:56 +00:00
Jeff Sharkey
fd1bb10753 Merge "Remove old FUSE bypass now that we have sdcardfs." into nyc-dev 2016-04-06 21:27:56 +00:00
Jeff Sharkey
feef8b62ee Remove old FUSE bypass now that we have sdcardfs.
This forces everyone to go through sdcardfs, instead of letting them
around the back door.

Bug: 27992761
Change-Id: If1d4d5daa4b32bb3be7de10102bab24d63552b65
2016-04-06 15:27:11 -06:00
Alex Hills
9ab3a238b3 Adds a content-intent-launching-activity flag to WearableExtender
This adds a flag to WearableExtender (and Action.WearableExtender)
indicating that the attached ContentIntent will launch an activity
on Wear, which lets the platform know that it can (and should)
generate a sleek transition for the launching of said intent (as
opposed to the intent causing change in the background).

Bug:28019194
Change-Id: Id8b422ea52c5e941e38558aaf31ce2cf4bb7c6f3
2016-04-06 17:20:11 -04:00
Selim Cinek
442e05139d Merge "Changed the default if the notification time is shown" into nyc-dev am: f2a587b
am: 1c81841

* commit '1c81841e06b7174d69d127709648e8c541c8d2db':
  Changed the default if the notification time is shown

Change-Id: Ia38e316076334d60fd543a6b1675c31c7bcc58ab
2016-04-06 20:56:47 +00:00
Selim Cinek
4b47ff616e Merge "Deprecated the contentinfo and the number" into nyc-dev am: 82404bc
am: ac51be5

* commit 'ac51be5b1cd048397ed9e4e0e7d6bac5b3610394':
  Deprecated the contentinfo and the number

Change-Id: I6acb57542bba80a9d4e8fadfbd480c3b3102ff3b
2016-04-06 20:56:42 +00:00