fionaxu
afed6f8631
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c am: 698e044717 am: c95d552de0
...
am: c10e4fae05
2016-06-08 18:24:16 +00:00
fionaxu
c10e4fae05
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c am: 698e044717
...
am: c95d552de0
2016-06-08 18:11:09 +00:00
fionaxu
c95d552de0
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c
...
am: 698e044717
2016-06-08 17:23:27 +00:00
fionaxu
698e044717
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e
...
am: 965084dd0c
2016-06-08 17:11:49 +00:00
fionaxu
965084dd0c
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e
...
am: 1e8fe12f4e
2016-06-08 17:04:09 +00:00
fionaxu
1e8fe12f4e
resolve merge conflicts of 2c53526 to lmp-mr1-dev
...
am: c196526f8e
2016-06-08 16:58:13 +00:00
fionaxu
c196526f8e
resolve merge conflicts of 2c53526 to lmp-mr1-dev
...
Change-Id: I4fe45fae0a98934ac9b0f6f48c8cab8546392641
2016-06-07 22:01:19 -07:00
fionaxu
2c53526b4b
Backport loadSafeLabel changes am: be2865a60a am: 4c50846519
...
am: 9a825b0fd5
2016-06-07 23:23:10 +00:00
fionaxu
9a825b0fd5
Backport loadSafeLabel changes am: be2865a60a
...
am: 4c50846519
2016-06-07 23:20:04 +00:00
fionaxu
4c50846519
Backport loadSafeLabel changes
...
am: be2865a60a
2016-06-07 23:13:08 +00:00
fionaxu
be2865a60a
Backport loadSafeLabel changes
...
Bug:23531798
Bug:28557603
Change-Id: Iee49f7c37d6a42fe74077bb15ed47919d351d172
2016-06-07 22:51:28 +00:00
Paul Jensen
94c8855da6
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938 am: 54a62d5feb am: a5a2c88fb3
...
am: 7ff57eaff9
2016-05-26 15:22:55 +00:00
Paul Jensen
7ff57eaff9
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938 am: 54a62d5feb
...
am: a5a2c88fb3
2016-05-26 15:13:07 +00:00
Paul Jensen
a5a2c88fb3
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938
...
am: 54a62d5feb
2016-05-26 15:02:46 +00:00
Paul Jensen
54a62d5feb
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02
...
am: 7c625e1938
2016-05-26 14:50:37 +00:00
Paul Jensen
7c625e1938
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364
...
am: 75095e6f02
2016-05-26 14:35:08 +00:00
Paul Jensen
75095e6f02
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434
...
am: 42a5983364
2016-05-26 14:13:16 +00:00
Paul Jensen
42a5983364
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141
...
am: 6c35cf2434
2016-05-26 14:01:19 +00:00
Paul Jensen
6c35cf2434
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff
...
am: bb27626141
2016-05-26 13:44:37 +00:00
Paul Jensen
bb27626141
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff
...
am: 8940d2b0ff
2016-05-26 13:37:24 +00:00
Paul Jensen
8940d2b0ff
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev
...
am: af0b4466ff
2016-05-26 13:30:59 +00:00
Adam Powell
e7e49b48b2
Backport ChooserTarget package source check from N am: 82b9565bd1 am: 6d5f80d13b
...
am: 7ac638702d
2016-05-02 21:26:29 +00:00
Adam Powell
7ac638702d
Backport ChooserTarget package source check from N am: 82b9565bd1
...
am: 6d5f80d13b
2016-05-02 21:21:11 +00:00
Adam Powell
6d5f80d13b
Backport ChooserTarget package source check from N
...
am: 82b9565bd1
2016-05-02 21:15:05 +00:00
Adam Powell
82b9565bd1
Backport ChooserTarget package source check from N
...
Fix a bug where a ChooserTargetService could supply a ChooserTarget
pointing at a non-exported activity outside of its own package and
have it launch.
Bug 28384423
Change-Id: I3f5854f91c5695ad9253d71055ef58224df47008
2016-04-29 15:38:13 +00:00
Paul Jensen
08ec0e53b8
Don't pass URL path and username/password to PAC scripts
...
The URL path could contain credentials that apps don't want exposed
to a potentially malicious PAC script.
Bug: 27593919
Change-Id: I4bb0362fc91f70ad47c4c7453d77d6f9a1e8eeed
2016-04-29 10:57:13 +00:00
Michael Wright
bc57aaed0e
Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev am: 224582e am: c6629bd
...
am: a8064c2
2016-04-18 18:57:54 +00:00
Michael Wright
a8064c2a8b
Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev am: 224582e
...
am: c6629bd
2016-04-18 18:52:13 +00:00
Michael Wright
c6629bd5df
Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev
...
am: 224582e
* commit '224582e0403bb123da49d80af21f108900185769':
Add new, hidden MotionEvent flag for partially obscured windows.
Change-Id: I24f2bf328c91bbc05f1b76ed464d962c71e92245
2016-04-18 18:46:44 +00:00
Michael Wright
224582e040
Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev
2016-04-18 18:40:19 +00:00
Todd Kennedy
7b068fa903
DO NOT MERGE Fix intent filter priorities am: eeb970a am: cd24c4e
...
am: bd770bc
2016-04-11 22:12:05 +00:00
Todd Kennedy
ca133845ef
DO NOT MERGE Fix intent filter priorities am: 60351d3
...
am: 3dfc6d9
2016-04-11 22:06:38 +00:00
Todd Kennedy
bd770bc97b
DO NOT MERGE Fix intent filter priorities am: eeb970a
...
am: cd24c4e
2016-04-11 22:06:35 +00:00
Todd Kennedy
3dfc6d986f
DO NOT MERGE Fix intent filter priorities
...
am: 60351d3
2016-04-11 22:00:27 +00:00
Todd Kennedy
cd24c4ebc0
DO NOT MERGE Fix intent filter priorities
...
am: eeb970a
2016-04-11 22:00:26 +00:00
Todd Kennedy
60351d3be2
DO NOT MERGE Fix intent filter priorities
...
Since this is a backport, there is only one rule that guards intent
filter priorities:
1) Updates will NOT be granted a priority greater than the priority
defined on the system image.
NOTE: I had to bring in pieces of ag/526831 so intent filters could
be collected and matched
Bug: 27450489
Change-Id: Ifcec4d7a59e684331399abc41eea1bd6876155a4
2016-04-07 16:40:18 -07:00
Todd Kennedy
eeb970ada1
DO NOT MERGE Fix intent filter priorities
...
Since this is a backport, there is only one rule that guards intent
filter priorities:
1) Updates will NOT be granted a priority greater than the priority
defined on the system image.
Bug: 27450489
Change-Id: Ifcec4d7a59e684331399abc41eea1bd6876155a4
2016-04-05 13:56:59 -07:00
Todd Kennedy
d6174e7402
DO NOT MERGE Fix intent filter priorities
...
Since this is a backport, there is only one rule that guards intent
filter priorities:
1) Updates will NOT be granted a priority greater than the priority
defined on the system image.
Bug: 27450489
Change-Id: Ifcec4d7a59e684331399abc41eea1bd6876155a4
2016-04-05 10:20:41 -07:00
Michael Wright
0625e11b37
Add new, hidden MotionEvent flag for partially obscured windows.
...
Bug: 26677796
Change-Id: Ic4219b883bb760495e6172ef61e84e9725876ef6
2016-03-31 15:53:44 -07:00
Sharvil Nanavati
cd8bb276f2
DO NOT MERGE ANYWHERE Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY.
...
Change-Id: I48c0a7bc39e2efcc5b4120a4fa2ecf6dfd54ac27
2016-03-24 00:23:38 +00:00
Bryce Lee
7c2539e2a5
DO NOT MERGE ANYWHERE Add way to query for supported Bluetooth profiles.
...
Currently there is no way to get the profiles supported by the Bluetooth
adapter. Asking for a profile proxy of an unsupported profile does not
fail and can lead to code indefinitely waiting for the proxy response. This
new code will allow for checking the supported profiles before asking for
the proxies.
Bug: 26451648
Change-Id: Ie209f08058205eea39513c03b626788f5fed3293
Signed-off-by: Bryce Lee <brycelee@google.com >
2016-02-29 14:59:07 -08:00
Andre Eisenbach
1cba33abf3
resolve merge conflicts of e6c7c8e8f2 to cw-e-dev
...
am: dfd4b8b25c
2016-02-24 19:57:07 +00:00
Andre Eisenbach
dfd4b8b25c
resolve merge conflicts of e6c7c8e8f2 to cw-e-dev
...
Change-Id: I94683e571a73df721206d7e5fc14cb817ec9620f
2016-02-24 11:36:27 -08:00
Andre Eisenbach
a39373cabd
DO NOT MERGE Read Bluetooth interop database entries from settings (1/2)
...
Interop database entries are stored in the system settings entry
"BluetoothInteropDatabase". The format is a list of entries separated by
";". An entry consists of a BDA fragment, followed by a comma and an
integer representing a feature from interop.h.
Example:
To disable LE secure connections for devices starting with BDA 11:22:33,
use "11:22:33,0".
Bug: 26548845
Change-Id: I6a9fd34f6af4d3bdfcaa0e051eafebdfbf2a4949
(cherry picked from commit 3bc623be8d
2016-02-23 01:10:11 -08:00
Adam Lesinski
9d89bd5cb8
DO NOT MERGE ANYWHERE: Don't change screen on time on time changes
...
Screen on time should be measured in elapsed realtime, not wallclock.
Cause a checkIdleStates to occur when reloading stats
(on rollover and on time change).
When time changes occur in the negative direction, the new stats file
we create can overlap the previous one with regards to its end timestamp.
Use the begin timestamp to determine which of the latest stats to merge.
(b/22716352)
Bug: 26488100
Change-Id: If31b29bbbee9e98401205b5e26bce86e181286e7
2016-02-19 21:05:07 +00:00
Adam Lesinski
1559fed4c4
DO NOT MERGE ANYWHERE: UsageStats: Use new settings key idle_duration2 for app idle
...
Ignores the old, re-appropriated key "idle_duration" which is now
set to a high value in order to force disable app idle on devices
with bug b/26355386
Bug:26355386
Change-Id: Iff9de843ad6e547d29c1583687fc7f7ce7e15090
2016-02-17 16:02:01 -08:00
Akshay Thakker
eae2b8978f
Merge "Exit getAllValidScorers early if not the primary." into mnc-dr-dev
...
am: ae31e13ae8
2016-02-14 22:27:20 +00:00
Jeremy Joslin
44d550c2d1
Exit getAllValidScorers early if not the primary.
...
This fixes the crash that occurs when getAllValidScorers() is invoked by
a non-primary user when a scorer is active.
BUG: 23040221
Change-Id: I42c9e18d74389be3191258ca5626f2c433ca7cc7
(cherry picked from commit 5b294b45d0
2016-02-12 23:50:22 +00:00
Adam Lesinski
b2d3ffaa20
Don't change screen on time on time changes
...
Screen on time should be measured in elapsed realtime, not wallclock.
Cause a checkIdleStates to occur when reloading stats
(on rollover and on time change).
When time changes occur in the negative direction, the new stats file
we create can overlap the previous one with regards to its end timestamp.
Use the begin timestamp to determine which of the latest stats to merge.
(b/22716352)
Bug: 26488100
Change-Id: If31b29bbbee9e98401205b5e26bce86e181286e7
2016-01-27 17:51:47 -08:00
Joe LaPenna
7528f57c4d
[DO NOT MERGE ANYWHERE]: Allow button events in ambient.
...
See thread: "key presses & Ambient"
BUG: 25964771
BUG: 26524301
Change-Id: I914edd447c38678a06d27677be4597c0ee384635
2016-01-27 14:19:44 -08:00
