drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
200,405 Commits 1 Branch 0 Tags
Commit Graph

200405 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
c3cd7b1585 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25319151
Change-Id: I4170f31d992d23a365c98fe5e799a31ef48f17bd
 2015-10-29 12:27:09 -07:00
Lorenzo Colitti
a2cc04736d Merge "Don't crash if a DHCP server doesn't send the server ID option." into mnc-dr-dev 2015-10-29 07:57:13 +00:00
Lorenzo Colitti
7611f1cdb4 Don't crash if a DHCP server doesn't send the server ID option. 
This violates a MUST in RFC2131, but apparently some
implementations don't know or care.

Bug: 25343517
Change-Id: I80459b58ffe231e7ed64e77bafa157a96b745149
 2015-10-29 16:09:16 +09:00
Svetoslav Ganov
2658cb002a Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev 2015-10-29 01:10:46 +00:00
Geoff Mendal
c7522c0b1c Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-10-28 14:38:11 +00:00
Geoff Mendal
bcefa34c3f Import translations. DO NOT MERGE 
Change-Id: Id9e2298a05893e3769f0e62bcda5fe70c058d11a
Auto-generated-cl: translation import
 2015-10-28 07:37:31 -07:00
Geoff Mendal
b8afc77c0a Import translations. DO NOT MERGE 
Change-Id: If7c4ccf382e85f88a4fac586ca870068d8219974
Auto-generated-cl: translation import
 2015-10-28 06:59:45 -07:00
Svetoslav
01af6a42a6 Make SYSTEM_ALERT_WINDOW development permission 
bug:25329324

Change-Id: I0086464846bab9424764dd0d726692d96a0f1207
 2015-10-27 18:12:06 -07:00
Daniel Sandler
da43cc0a21 Merge "Petites fautes." into mnc-dr-dev 2015-10-27 19:51:31 +00:00
Dan Sandler
aa1c08014e Petites fautes. 
Bug: 25308153
Change-Id: I62ffe080e3f36eb685cdc06d8c106d32e18092ed
 2015-10-27 13:42:55 -04:00
Dianne Hackborn
7682b26ea1 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
 2015-10-27 10:23:38 -07:00
Geoff Mendal
14bb0511c6 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-10-26 16:28:12 +00:00
Geoff Mendal
7afd89dfbb Import translations. DO NOT MERGE 
Change-Id: I0383c1869f289a39ca3db684712dbd812e626e9a
Auto-generated-cl: translation import
 2015-10-26 11:27:14 -05:00
Geoff Mendal
f6fc9e2152 Import translations. DO NOT MERGE 
Change-Id: I9bf90d06113d8333bed3eec1c65ed799a785fb63
Auto-generated-cl: translation import
 2015-10-26 07:17:06 -07:00
Puneet Kumar
ca9c43b27b Merge "Prevent recents from coming up when in SUW" into mnc-dr-dev 2015-10-24 15:20:28 +00:00
Michael Wright
d847ad5555 Prevent recents from coming up when in SUW 
Bug: 25229538
Change-Id: I141c4eb928a5ce7f9858922862fe3dc1d3a33a90
 2015-10-24 13:24:15 +01:00
Dan Sandler
493272c8a7 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
 2015-10-24 00:45:01 +00:00
Dan Sandler
e68e70d509 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
 2015-10-24 00:33:48 +00:00
Dan Sandler
7e16b2e8f5 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
 2015-10-24 00:15:49 +00:00
Dan Sandler
d9a96ff747 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
 2015-10-24 00:15:44 +00:00
Dan Sandler
ab4857790b 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
 2015-10-24 00:04:17 +00:00
Dan Sandler
511357c39b 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
 2015-10-24 00:04:06 +00:00
Dan Sandler
6c3186ea07 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
 2015-10-23 23:49:56 +00:00
Dan Sandler
410bea181b 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
 2015-10-23 23:49:54 +00:00
Dan Sandler
6026b5b17e 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
 2015-10-23 23:39:50 +00:00
Dan Sandler
4db8c18755 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
 2015-10-23 23:39:39 +00:00
Dan Sandler
b1de85487a 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
 2015-10-23 23:39:22 +00:00
xin He
3b47afe765 Merge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-dev 2015-10-23 20:45:24 +00:00
xinhe
2452e54de6 [DO NOT MERGE] EAP-TLS PMKID mismatch error 
b/24253154

Change-Id: I45c770dc4769e74b668385dbc3a618d31a40dc7e
 2015-10-23 12:56:25 -07:00
Adrian Roos
93a6b4c129 Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev 2015-10-23 17:21:23 +00:00
Dianne Hackborn
b32e020d23 Merge "DO NOT MERGE Fix issue #24118803: The screen doesn't turn off..." into mnc-dr-dev 2015-10-23 17:04:55 +00:00
Dan Sandler
1044e162c3 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
 2015-10-23 01:38:51 +00:00
Dan Sandler
51c2619c77 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
 2015-10-23 01:38:36 +00:00
Dan Sandler
446dcc9ed7 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)
 2015-10-23 01:37:52 +00:00
Adrian Roos
0450565d9a Revert "Revert "Track ashmem memory usage in Parcel"" 
This reverts commit e2adb2cf0f2c90c77fab3f09285a92e05e70b567.

Bug: 25004154
Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158
 2015-10-22 17:49:38 -07:00
Dianne Hackborn
7730cd2740 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
 2015-10-22 17:40:23 -07:00
Sungmin Choi
a665ea7207 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
 2015-10-22 16:59:44 -07:00
Ian Pedowitz
09fd4ecf90 Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev 2015-10-22 22:26:32 +00:00
Ian Pedowitz
e2adb2cf0f Revert "Track ashmem memory usage in Parcel" 
This reverts commit ab3f9724035046d65124a72db2a09c824b3d5c67.

Bug: 25169267
Bug: 25191602
Bug: 25004154
Change-Id: Ic51e62515273e4687359dfd9ff770a4d06c0c667
 2015-10-22 22:09:04 +00:00
Nicolas Prévot
6666b29cf7 Merge "Don't resolve cross-profile app links without intent picker." into mnc-dr-dev 2015-10-22 20:29:51 +00:00
Dmitry Torokhov
79f00cf06f 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
 2015-10-22 10:19:32 -07:00
Nicolas Prevot
ff91ef8ed1 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
 2015-10-22 18:16:39 +01:00
Yoshiki Iguchi
9582e15196 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
 2015-10-22 07:28:47 +00:00
Lorenzo Colitti
809dcade99 Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev 2015-10-22 06:15:05 +00:00
Nathan Harold
0dccd12800 Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo() 
-Fixed doc string

Bug: 23979591

This reverts commit f7b6474de87fd2eee377dc612c757102cdacc003.

Change-Id: I127f1452f4319a154dd4d962d4a63c84f0833702
 2015-10-21 20:35:46 -07:00
Nathan Harold
42015c4081 Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev 2015-10-22 02:54:45 +00:00
Nathan Harold
f7b6474de8 Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" 
This reverts commit 5d1429e0dd1a13f76dbb354f9e4e415f71956299.

Doc string isn't resolving. Temporarily reverting.

Change-Id: I128b13abcf938c96b24225e373ac0885c24e083e
 2015-10-22 02:53:57 +00:00
Nathan Harold
f8a4dc4a6f Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev 2015-10-22 01:58:37 +00:00
Adrian Roos
33e1d376eb Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev 2015-10-22 00:46:03 +00:00
Dianne Hackborn
676534e008 Merge "Hopefully fix issue #25153459: Sandboxed_process1 thrashing" into mnc-dr-dev 2015-10-22 00:37:33 +00:00