OSDN Git Service

android-x86/frameworks-base.git
8 years agoUpdate permission label strings
Anthony Hugh [Tue, 27 Oct 2015 21:13:42 +0000 (14:13 -0700)]
Update permission label strings

Updates permission labels to have more consistent
grammar and capitalization.

BUG: 23760467
Change-Id: I61c2f9c72fdf4318e1773f3e0385fb86e0d65f69

8 years agoMerge "Petites fautes." into mnc-dr-dev
Daniel Sandler [Tue, 27 Oct 2015 20:00:01 +0000 (20:00 +0000)]
Merge "Petites fautes." into mnc-dr-dev
am: da43cc0a21

* commit 'da43cc0a2150a1c74340b75c919425e2a3f5b6fe':
  Petites fautes.

8 years agoMerge "Petites fautes." into mnc-dr-dev
Daniel Sandler [Tue, 27 Oct 2015 19:51:31 +0000 (19:51 +0000)]
Merge "Petites fautes." into mnc-dr-dev

8 years agoFix issue #25289999: Lower device idle alarm limit to 10 mins.
Dianne Hackborn [Tue, 27 Oct 2015 19:46:12 +0000 (19:46 +0000)]
Fix issue #25289999: Lower device idle alarm limit to 10 mins.
am: 7682b26ea1

* commit '7682b26ea164ba1078495e24910f22d73766c192':
  Fix issue #25289999: Lower device idle alarm limit to 10 mins.

8 years agoPetites fautes.
Dan Sandler [Tue, 27 Oct 2015 17:42:55 +0000 (13:42 -0400)]
Petites fautes.

Bug: 25308153
Change-Id: I62ffe080e3f36eb685cdc06d8c106d32e18092ed

8 years agoFix issue #25289999: Lower device idle alarm limit to 10 mins.
Dianne Hackborn [Tue, 27 Oct 2015 00:51:57 +0000 (17:51 -0700)]
Fix issue #25289999: Lower device idle alarm limit to 10 mins.

This helps with some cases where perisistent network connections
need a more frequent keep alive signal.  Actually make it 9
minutes to ensure that things needing a 10 minute cycle will
execute within that time.

Change-Id: Ife8c7b7f7f82b108d5a6c1624bd6115e6087c3be

8 years agoMerge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Mon, 26 Oct 2015 19:36:01 +0000 (19:36 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev

8 years agoMerge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Mon, 26 Oct 2015 19:35:20 +0000 (19:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev

8 years agoMerge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Mon, 26 Oct 2015 19:35:02 +0000 (19:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 19:06:21 +0000 (12:06 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ic500efe78e3dd02f8dd74b8c687443bbe559355b
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 19:04:18 +0000 (12:04 -0700)]
Import translations. DO NOT MERGE

Change-Id: I07f75df116b723529d96cacf5ac8431caafb022d
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 19:02:09 +0000 (12:02 -0700)]
Import translations. DO NOT MERGE

Change-Id: I9ecfe0ecad2b5aa88fc4b60d6d5f8e718ec19bcf
Auto-generated-cl: translation import

8 years agoMerge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Mon, 26 Oct 2015 18:59:41 +0000 (18:59 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev

8 years agoMerge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Mon, 26 Oct 2015 18:59:25 +0000 (18:59 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev

8 years agoMerge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Mon, 26 Oct 2015 18:59:13 +0000 (18:59 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 18:49:23 +0000 (11:49 -0700)]
Import translations. DO NOT MERGE

Change-Id: I8a0b74d374b31531c37be9b0d8bc251300a82009
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 18:43:00 +0000 (11:43 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia70d07e17335f2a77a0c66ff9fb906e6f6f70171
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 18:40:53 +0000 (11:40 -0700)]
Import translations. DO NOT MERGE

Change-Id: I19a669e57b0264602c1daa8703caa8ac506a6cd7
Auto-generated-cl: translation import

8 years agoMerge "Add Telecom config bool to require a phone account to be present for handle...
Bryce Lee [Mon, 26 Oct 2015 17:08:49 +0000 (17:08 +0000)]
Merge "Add Telecom config bool to require a phone account to be present for handle" into cw-e-dev

8 years agoMerge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Mon, 26 Oct 2015 16:57:30 +0000 (16:57 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 16:53:50 +0000 (11:53 -0500)]
Import translations. DO NOT MERGE

Change-Id: I3b8c2defeead0f1a68f261eaa271e7a316130627
Auto-generated-cl: translation import

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 26 Oct 2015 16:33:36 +0000 (16:33 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am: 14bb0511c6  -s ours

* commit '14bb0511c6cc5ad62a870b3c2437c8090bcf75af':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 26 Oct 2015 16:28:12 +0000 (16:28 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 16:27:14 +0000 (11:27 -0500)]
Import translations. DO NOT MERGE

Change-Id: I0383c1869f289a39ca3db684712dbd812e626e9a
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 14:31:12 +0000 (14:31 +0000)]
Import translations. DO NOT MERGE
am: f6fc9e2152  -s ours

* commit 'f6fc9e215292945ef3add558e513e5eef01acbfe':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 14:17:06 +0000 (07:17 -0700)]
Import translations. DO NOT MERGE

Change-Id: I9bf90d06113d8333bed3eec1c65ed799a785fb63
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 12:11:27 +0000 (05:11 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iafffd8db9db17c15f46c82ba641c6f6ad83d4059
Auto-generated-cl: translation import

8 years agoAdd Telecom config bool to require a phone account to be present for handle
Bryce Lee [Mon, 26 Oct 2015 05:27:10 +0000 (22:27 -0700)]
Add Telecom config bool to require a phone account to be present for handle

Bug: 25202039
Change-Id: I83f6a72ed78fd22bddc7be46d24af33781a65f6e

8 years agoMerge "Prevent recents from coming up when in SUW" into mnc-dr-dev
Puneet Kumar [Sat, 24 Oct 2015 15:42:33 +0000 (15:42 +0000)]
Merge "Prevent recents from coming up when in SUW" into mnc-dr-dev
am: ca9c43b27b

* commit 'ca9c43b27b9e3bc007e731fe3a214cbed3edf8f3':
  Prevent recents from coming up when in SUW

8 years agoMerge "Prevent recents from coming up when in SUW" into mnc-dr-dev
Puneet Kumar [Sat, 24 Oct 2015 15:20:28 +0000 (15:20 +0000)]
Merge "Prevent recents from coming up when in SUW" into mnc-dr-dev

8 years agoPrevent recents from coming up when in SUW
Michael Wright [Sat, 24 Oct 2015 12:24:15 +0000 (13:24 +0100)]
Prevent recents from coming up when in SUW

Bug: 25229538
Change-Id: I141c4eb928a5ce7f9858922862fe3dc1d3a33a90

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a...
Dan Sandler [Sat, 24 Oct 2015 00:58:58 +0000 (00:58 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a  -s ours am: 410bea181b am: 511357c39b am: 7e16b2e8f5  -s ours am: e68e70d509
am: 493272c8a7

* commit '493272c8a7e7219f947a222cd71aaaf3d4bc3c0a':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a...
Dan Sandler [Sat, 24 Oct 2015 00:45:01 +0000 (00:45 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a  -s ours am: 410bea181b am: 511357c39b am: 7e16b2e8f5  -s ours
am: e68e70d509

* commit 'e68e70d509e2a0ba1c8bd56c231bf1c6cc3da967':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a...
Dan Sandler [Sat, 24 Oct 2015 00:33:48 +0000 (00:33 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a  -s ours am: 410bea181b am: 511357c39b
am: 7e16b2e8f5  -s ours

* commit '7e16b2e8f5b74d29711d330f6982d8ed12c3f4db':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e...
Dan Sandler [Sat, 24 Oct 2015 00:33:33 +0000 (00:33 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e am: 6c3186ea07  -s ours am: ab4857790b
am: d9a96ff747

* commit 'd9a96ff7475a85ed60b42f96115db634e8c313cf':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a...
Dan Sandler [Sat, 24 Oct 2015 00:15:49 +0000 (00:15 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a  -s ours am: 410bea181b
am: 511357c39b

* commit '511357c39b058b0d03beb175c1c35990729ee3d0':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e...
Dan Sandler [Sat, 24 Oct 2015 00:15:44 +0000 (00:15 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e am: 6c3186ea07  -s ours
am: ab4857790b

* commit 'ab4857790bc84388817c0bec8c4010d660f35ada':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e
Dan Sandler [Sat, 24 Oct 2015 00:04:17 +0000 (00:04 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e
am: 6c3186ea07  -s ours

* commit '6c3186ea07a735d84e9a33e9864366b01f1f4c86':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a...
Dan Sandler [Sat, 24 Oct 2015 00:04:06 +0000 (00:04 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a  -s ours
am: 410bea181b

* commit '410bea181b229adef7a2c1a9308379eead260706':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77
Dan Sandler [Fri, 23 Oct 2015 23:49:56 +0000 (23:49 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77
am: 6026b5b17e

* commit '6026b5b17e786c180909d8fe5f6747e446e1d365':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3
Dan Sandler [Fri, 23 Oct 2015 23:49:54 +0000 (23:49 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3
am: b1de85487a  -s ours

* commit 'b1de85487af1726c3d9e80d78bd643f550d9f3a4':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE am: 446dcc9ed7
Dan Sandler [Fri, 23 Oct 2015 23:49:43 +0000 (23:49 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 446dcc9ed7
am: 4db8c18755

* commit '4db8c187551bd238b50a85a7be3be6595a69a2ed':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Fri, 23 Oct 2015 23:39:50 +0000 (23:39 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
am: 51c2619c77

* commit '51c2619c7706575a171cf29819db14e91b815a62':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Fri, 23 Oct 2015 23:39:39 +0000 (23:39 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
am: 446dcc9ed7

* commit '446dcc9ed7efa0b80ed7d353478326b2236f2cab':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Fri, 23 Oct 2015 23:39:22 +0000 (23:39 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
am: 1044e162c3

* commit '1044e162c3dc4169b79112fc1a2de14757bca8c3':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoMerge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-dev
xin He [Fri, 23 Oct 2015 20:53:48 +0000 (20:53 +0000)]
Merge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-dev
am: 3b47afe765

* commit '3b47afe7656eb16e8ddb04d771a18eab678c125f':
  [DO NOT MERGE] EAP-TLS PMKID mismatch error

8 years agoMerge "Add config flag for reloading supported profiles in bluetooth on enable."...
Bryce Lee [Fri, 23 Oct 2015 20:52:44 +0000 (20:52 +0000)]
Merge "Add config flag for reloading supported profiles in bluetooth on enable." into cw-e-dev

8 years agoMerge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-dev
xin He [Fri, 23 Oct 2015 20:45:24 +0000 (20:45 +0000)]
Merge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-dev

8 years ago[DO NOT MERGE] EAP-TLS PMKID mismatch error
xinhe [Wed, 21 Oct 2015 18:47:03 +0000 (11:47 -0700)]
[DO NOT MERGE] EAP-TLS PMKID mismatch error

b/24253154

Change-Id: I45c770dc4769e74b668385dbc3a618d31a40dc7e

8 years agoAdd config flag for reloading supported profiles in bluetooth on enable.
Bryce Lee [Fri, 23 Oct 2015 19:32:07 +0000 (12:32 -0700)]
Add config flag for reloading supported profiles in bluetooth on enable.

Bug: 24977590
Change-Id: I9aa0db5f5488f1ad400f3c0be7d8055ed36725dc

8 years agoMerge "Factor chin size into dimension checking to determine if CircularDisplayMask...
Ching Tzung Lin [Fri, 23 Oct 2015 18:05:52 +0000 (18:05 +0000)]
Merge "Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on." into cw-e-dev

8 years agoMerge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev
Adrian Roos [Fri, 23 Oct 2015 17:29:13 +0000 (17:29 +0000)]
Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev
am: 93a6b4c129

* commit '93a6b4c12904bd1804a540d006c183851b0aea33':
  Revert "Revert "Track ashmem memory usage in Parcel""

8 years agoMerge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev
Adrian Roos [Fri, 23 Oct 2015 17:21:23 +0000 (17:21 +0000)]
Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev

8 years agoMerge "DO NOT MERGE Fix issue #24118803: The screen doesn\'t turn off..." into mnc...
Dianne Hackborn [Fri, 23 Oct 2015 17:09:45 +0000 (17:09 +0000)]
Merge "DO NOT MERGE Fix issue #24118803: The screen doesn\'t turn off..." into mnc-dr-dev
am: b32e020d23

* commit 'b32e020d237cfd94cdfe8c589900a899dc14413a':
  DO NOT MERGE Fix issue #24118803: The screen doesn't turn off...

8 years agoMerge "DO NOT MERGE Fix issue #24118803: The screen doesn't turn off..." into mnc...
Dianne Hackborn [Fri, 23 Oct 2015 17:04:55 +0000 (17:04 +0000)]
Merge "DO NOT MERGE Fix issue #24118803: The screen doesn't turn off..." into mnc-dr-dev

8 years agoRemove tether_apndata for Sasktel
Sungmin Choi [Fri, 23 Oct 2015 03:26:18 +0000 (03:26 +0000)]
Remove tether_apndata for Sasktel
am: a665ea7207

* commit 'a665ea72075dbaa5a86f866ee6c8df5a80f1ced3':
  Remove tether_apndata for Sasktel

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Tue, 20 Oct 2015 23:01:27 +0000 (16:01 -0700)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE

Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.

Bug: 19121797
(cherry picked from commit 8fd25bf7711aabffe73213ba1f9056f285270695)

Change-Id: I14d9fb54521dc6d60822e7c683e4e92fd62cdc6a

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Tue, 20 Oct 2015 23:01:27 +0000 (16:01 -0700)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE

Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.

(cherry picked from commit 8fd25bf7711aabffe73213ba1f9056f285270695)

Bug: 19121797
Change-Id: I7a5c12b371b735c756ca5a3e8716c385fb3fbfe9

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Tue, 20 Oct 2015 23:01:27 +0000 (16:01 -0700)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE

Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.

Bug: 19121797
Change-Id: I52b69b2029439d42163ead5dc8748889b4f61934
(cherry picked from commit 8fd25bf7711aabffe73213ba1f9056f285270695)

8 years agoRevert "Revert "Track ashmem memory usage in Parcel""
Adrian Roos [Thu, 22 Oct 2015 23:12:01 +0000 (16:12 -0700)]
Revert "Revert "Track ashmem memory usage in Parcel""

This reverts commit e2adb2cf0f2c90c77fab3f09285a92e05e70b567.

Bug: 25004154
Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158

8 years agoDO NOT MERGE Fix issue #24118803: The screen doesn't turn off...
Dianne Hackborn [Fri, 23 Oct 2015 00:40:23 +0000 (17:40 -0700)]
DO NOT MERGE Fix issue #24118803: The screen doesn't turn off...

...after more than 60 minutes left

The sensing timeout alarm was being cancelled immediately after it
was scheduled it.  Now only cancel it when we are done sensing or
have reset activity.

Change-Id: Id0440cda7dd1b81bf871f16dfb015df6284cf6af

8 years agoRemove tether_apndata for Sasktel
Sungmin Choi [Fri, 16 Oct 2015 21:39:22 +0000 (14:39 -0700)]
Remove tether_apndata for Sasktel

Device has second APN (inet.stm.sk.ca) is being used for hot spot/tethered data.
SaskTel has moved to a single APN on devices (pda.stm.sk.ca).

BUG=25064017
Change-Id: I5ba1f9e7c3b54cf8e8681a289693aba0ac584296

8 years agoMerge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev
Ian Pedowitz [Thu, 22 Oct 2015 22:32:37 +0000 (22:32 +0000)]
Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev
am: 09fd4ecf90

* commit '09fd4ecf90c7ae2536a6848e8c88c4878e0e0c24':
  Revert "Track ashmem memory usage in Parcel"

8 years agoMerge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev
Ian Pedowitz [Thu, 22 Oct 2015 22:26:32 +0000 (22:26 +0000)]
Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev

8 years agoFactor chin size into dimension checking to determine if
Ching Tzung Lin [Thu, 22 Oct 2015 22:02:57 +0000 (15:02 -0700)]
Factor chin size into dimension checking to determine if
CircularDisplayMask can be turned on.

Bug:24797866
Change-Id: I1b8061a8d00dca1877c1360f6fab228a1d72a70a

8 years agoRevert "Track ashmem memory usage in Parcel"
Ian Pedowitz [Thu, 22 Oct 2015 22:08:07 +0000 (22:08 +0000)]
Revert "Track ashmem memory usage in Parcel"

This reverts commit ab3f9724035046d65124a72db2a09c824b3d5c67.

Bug: 25169267
Bug: 25191602
Bug: 25004154
Change-Id: Ic51e62515273e4687359dfd9ff770a4d06c0c667

8 years agoMerge "Don\'t resolve cross-profile app links without intent picker." into mnc-dr-dev
Nicolas Prévot [Thu, 22 Oct 2015 20:35:19 +0000 (20:35 +0000)]
Merge "Don\'t resolve cross-profile app links without intent picker." into mnc-dr-dev
am: 6666b29cf7

* commit '6666b29cf7c5ddaeae3d66606a9982f7c5cc8686':
  Don't resolve cross-profile app links without intent picker.

8 years agoMerge "Don't resolve cross-profile app links without intent picker." into mnc-dr-dev
Nicolas Prévot [Thu, 22 Oct 2015 20:29:51 +0000 (20:29 +0000)]
Merge "Don't resolve cross-profile app links without intent picker." into mnc-dr-dev

8 years agoSystemUI: fix automatic pairing of BT keyboards
Dmitry Torokhov [Thu, 22 Oct 2015 18:13:36 +0000 (18:13 +0000)]
SystemUI: fix automatic pairing of BT keyboards
am: 79f00cf06f

* commit '79f00cf06f5e70047d73b48d20910b967353b075':
  SystemUI: fix automatic pairing of BT keyboards

8 years agoMerge "Give watch Home app location permissions by default" into cw-e-dev
Anthony Hugh [Thu, 22 Oct 2015 17:22:21 +0000 (17:22 +0000)]
Merge "Give watch Home app location permissions by default" into cw-e-dev

8 years agoSystemUI: fix automatic pairing of BT keyboards
Dmitry Torokhov [Thu, 22 Oct 2015 17:07:53 +0000 (10:07 -0700)]
SystemUI: fix automatic pairing of BT keyboards

After reset (docking) Pixel C Keyboard that was previously paired with
a device goes into so-called non-discoverable mode, where it will
establish connection only with device that it has connected before. When
scanning for available devices we need to wait till the keyboard starts
advertising itself as discoverable, and only then try to pair.

Also, let's flush the device cache when we attach the base to make sure
the device that we seen before and cached again in the right state after
reset.

Bug: 24915541
Change-Id: I136c1c4235080a25529b4b1c2b1da9bc18508811

8 years agoDon't resolve cross-profile app links without intent picker.
Nicolas Prevot [Thu, 22 Oct 2015 13:55:26 +0000 (14:55 +0100)]
Don't resolve cross-profile app links without intent picker.

If ALLOW_CROSS_PROFILE_APP_LINKING has been set:
If there is an app with status always across profiles, and some
apps without status always in the current profile: show an intent
picker instead of directly resolving across profiles.

BUG:25109215

Change-Id: I74a67d231284ce912121ea0818109fbf904183e8

8 years agoFix crash on calling removeSelection with showing selection handlers
Yoshiki Iguchi [Thu, 22 Oct 2015 07:39:17 +0000 (07:39 +0000)]
Fix crash on calling removeSelection with showing selection handlers
am: 9582e15196

* commit '9582e151964be60457d4abd712857fb1e8a4586d':
  Fix crash on calling removeSelection with showing selection handlers

8 years agoFix crash on calling removeSelection with showing selection handlers
Yoshiki Iguchi [Thu, 15 Oct 2015 04:34:41 +0000 (13:34 +0900)]
Fix crash on calling removeSelection with showing selection handlers

A crash occured on updating after calling removeSelection with showing
selection handlers. This was because some selection-handler code didn't
consider the case the selection index was -1 (-1 means there is no selection).
This patch fixes this crash.

Bug: 23299977
Change-Id: I736d315e073f773aec597522203015205a8da42b

8 years agoMerge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev
Lorenzo Colitti [Thu, 22 Oct 2015 06:18:43 +0000 (06:18 +0000)]
Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev
am: 809dcade99

* commit '809dcade9906001f6aa51a68aa783e20bb1d7c0d':
  Reinstate CHANGE_NETWORK_STATE as a normal permission.

8 years agoMerge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev
Lorenzo Colitti [Thu, 22 Oct 2015 06:15:05 +0000 (06:15 +0000)]
Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev

8 years agoAdd the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Nathan Harold [Thu, 22 Oct 2015 05:23:34 +0000 (05:23 +0000)]
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
am: 0dccd12800

* commit '0dccd128001ceff9437f736bd70dfd1986e315d5':
  Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()

8 years agoAdd the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Nathan Harold [Thu, 22 Oct 2015 03:12:10 +0000 (20:12 -0700)]
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()

-Fixed doc string

Bug: 23979591

This reverts commit f7b6474de87fd2eee377dc612c757102cdacc003.

Change-Id: I127f1452f4319a154dd4d962d4a63c84f0833702

8 years agoMerge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellIn...
Nathan Harold [Thu, 22 Oct 2015 02:58:15 +0000 (02:58 +0000)]
Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev
am: 42015c4081

* commit '42015c4081f9d37d579f0be15e11725cf6cc5fba':
  Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"

8 years agoMerge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellIn...
Nathan Harold [Thu, 22 Oct 2015 02:54:45 +0000 (02:54 +0000)]
Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev

8 years agoRevert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
Nathan Harold [Thu, 22 Oct 2015 02:53:57 +0000 (02:53 +0000)]
Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"

This reverts commit 5d1429e0dd1a13f76dbb354f9e4e415f71956299.

Doc string isn't resolving. Temporarily reverting.

Change-Id: I128b13abcf938c96b24225e373ac0885c24e083e

8 years agoMerge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo(...
Nathan Harold [Thu, 22 Oct 2015 02:03:32 +0000 (02:03 +0000)]
Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev
am: f8a4dc4a6f

* commit 'f8a4dc4a6f8383fc2999ce1292d900912a0da842':
  Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()

8 years agoMerge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo(...
Nathan Harold [Thu, 22 Oct 2015 01:58:37 +0000 (01:58 +0000)]
Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev

8 years agoMerge "Track ashmem memory usage in Parcel" into mnc-dr-dev
Adrian Roos [Thu, 22 Oct 2015 00:49:52 +0000 (00:49 +0000)]
Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev
am: 33e1d376eb

* commit '33e1d376ebd643cba5b507d0005b87d49e246bb5':
  Track ashmem memory usage in Parcel

8 years agoMerge "Track ashmem memory usage in Parcel" into mnc-dr-dev
Adrian Roos [Thu, 22 Oct 2015 00:46:03 +0000 (00:46 +0000)]
Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev

8 years agoMerge "Hopefully fix issue #25153459: Sandboxed_process1 thrashing" into mnc-dr-dev
Dianne Hackborn [Thu, 22 Oct 2015 00:40:35 +0000 (00:40 +0000)]
Merge "Hopefully fix issue #25153459: Sandboxed_process1 thrashing" into mnc-dr-dev
am: 676534e008

* commit '676534e00805e8102ea1458eba2b2cab1dbe7b3d':
  Hopefully fix issue #25153459: Sandboxed_process1 thrashing

8 years agoMerge "Hopefully fix issue #25153459: Sandboxed_process1 thrashing" into mnc-dr-dev
Dianne Hackborn [Thu, 22 Oct 2015 00:37:33 +0000 (00:37 +0000)]
Merge "Hopefully fix issue #25153459: Sandboxed_process1 thrashing" into mnc-dr-dev

8 years agoTrack ashmem memory usage in Parcel
Adrian Roos [Wed, 21 Oct 2015 21:50:38 +0000 (14:50 -0700)]
Track ashmem memory usage in Parcel

Bug: 25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
(cherry picked from commit 4701a496a5477a7de01fbc9eaf4af9812f83770c)

8 years agoHopefully fix issue #25153459: Sandboxed_process1 thrashing
Dianne Hackborn [Thu, 22 Oct 2015 00:12:53 +0000 (17:12 -0700)]
Hopefully fix issue #25153459: Sandboxed_process1 thrashing

There is a race where if you unbind to a service before its
process has come up, we would leave the service record active
and keep it running.  Fix this by checking the service state
after its process up and proceed to bring it down if it is no
longer needed.

Also added a similar check when restarting a service, just in
case there are other ways we can get into this situation.

And while I am at it, I tweaked the broadcast queue dump output
a bit to hopefully make it a lot easier to figure out how long
it is taking to process broadcasts.

Change-Id: I46b98f1fe394ab8039ea4cc81fb5d3afb6391a31

8 years agoReinstate CHANGE_NETWORK_STATE as a normal permission.
Lorenzo Colitti [Thu, 15 Oct 2015 07:29:00 +0000 (16:29 +0900)]
Reinstate CHANGE_NETWORK_STATE as a normal permission.

This is a partial revert of http://ag/738523 , but not a full
revert because M apps that have gone through the WRITE_SETTINGS
route to obtain permission to change network state should
continue to have permission to do so.

Specifically:

1. Change the protection level of CHANGE_NETWORK_STATE back from
   "signature|preinstalled|appop|pre23" to "normal". This allows
   apps that declare CHANGE_NETWORK_STATE in their manifest to
   acquire it, even if they target the M SDK or above.
2. Change the ConnectivityManager permission checks so that they
   first check CHANGE_NETWORK_STATE, and then ask Settings
   if the app has the WRITE_SETTINGS runtime permission.
3. Slightly simplify the code in the Settings provider code that
   deals specifically with the ability to change network state.
4. Make the ConnectivityService permissions checks use the
   ConnectivityManager code to avoid code duplication.
5. Update the ConnectivityManager public Javadoc to list both
   CHANGE_NETWORK_STATE and WRITE_SETTINGS.

Bug: 21588539
Bug: 23597341
Change-Id: Ic06a26517c95f9ad94183f6d126fd0de45de346e

8 years agoMerge "Delay hiding the cast icon for 3 seconds." into mnc-dr-dev
Daniel Sandler [Wed, 21 Oct 2015 23:18:54 +0000 (23:18 +0000)]
Merge "Delay hiding the cast icon for 3 seconds." into mnc-dr-dev
am: cb10c09f0a

* commit 'cb10c09f0a6c0750d79bf4f681a623fa35f4cef7':
  Delay hiding the cast icon for 3 seconds.

8 years agoMerge "Delay hiding the cast icon for 3 seconds." into mnc-dr-dev
Daniel Sandler [Wed, 21 Oct 2015 23:14:50 +0000 (23:14 +0000)]
Merge "Delay hiding the cast icon for 3 seconds." into mnc-dr-dev

8 years agoDelay hiding the cast icon for 3 seconds.
Dan Sandler [Tue, 20 Oct 2015 23:01:27 +0000 (16:01 -0700)]
Delay hiding the cast icon for 3 seconds.

Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.

Bug: 19121797
Change-Id: I52b69b2029439d42163ead5dc8748889b4f61934

8 years agoMerge "Don\'t query ChooserTargetService apps that haven\'t been used recently" into...
Adam Powell [Wed, 21 Oct 2015 20:47:14 +0000 (20:47 +0000)]
Merge "Don\'t query ChooserTargetService apps that haven\'t been used recently" into mnc-dr-dev
am: b8cfc12c3f

* commit 'b8cfc12c3f0b83e9d00b1f324be4ff5c977645ce':
  Don't query ChooserTargetService apps that haven't been used recently

8 years agoMerge "Changing the ordering for heads up notifications" into mnc-dr-dev
Selim Cinek [Wed, 21 Oct 2015 20:45:17 +0000 (20:45 +0000)]
Merge "Changing the ordering for heads up notifications" into mnc-dr-dev
am: 688e046bad

* commit '688e046bad87cc722e8571b8f4180604623239a8':
  Changing the ordering for heads up notifications

8 years agoMerge "Don't query ChooserTargetService apps that haven't been used recently" into...
Adam Powell [Wed, 21 Oct 2015 20:40:45 +0000 (20:40 +0000)]
Merge "Don't query ChooserTargetService apps that haven't been used recently" into mnc-dr-dev

8 years agoMerge "Changing the ordering for heads up notifications" into mnc-dr-dev
Selim Cinek [Wed, 21 Oct 2015 20:39:28 +0000 (20:39 +0000)]
Merge "Changing the ordering for heads up notifications" into mnc-dr-dev

8 years agoMerge "Maintain shared user list on OTA" into mnc-dr-dev
Todd Kennedy [Wed, 21 Oct 2015 20:38:28 +0000 (20:38 +0000)]
Merge "Maintain shared user list on OTA" into mnc-dr-dev
am: 0cd10ec8cf

* commit '0cd10ec8cf7a896bbdfc0639bf5f9c663c46edbb':
  Maintain shared user list on OTA

8 years agoMerge "Maintain shared user list on OTA" into mnc-dr-dev
Todd Kennedy [Wed, 21 Oct 2015 20:33:31 +0000 (20:33 +0000)]
Merge "Maintain shared user list on OTA" into mnc-dr-dev

8 years agoNarrow permission re-granting to specific volume.
Jeff Sharkey [Wed, 21 Oct 2015 20:32:42 +0000 (20:32 +0000)]
Narrow permission re-granting to specific volume.
am: 052366ca4e

* commit '052366ca4e6138b583d08535bd1837deb7cd58d0':
  Narrow permission re-granting to specific volume.