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

212888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Kenny Root
9a65c36022 Merge "Add Workman keyboard layout" 2015-10-23 23:32:01 +00:00
Ching Tzung Lin
f6e4c9da5f Consolidates config_windowOutsetBottom and circular_display_mask_offset 
Three phases involved:
phase 1: change all code references to circurlar_display_mask_offset to
config_windowOutsetBottom, and mark circular_display_mask_offset
deprecated.

phase 2: remove circular_display_mask_offset from device overlays

phase 3: remove circular_display_mask_offset symbol and default setting.

Bug:25220421
Change-Id: Ia3f77610dbbb964eb58c6b28f6206799d56c44c2
 2015-10-23 15:49:52 -07:00
xin He
97170138bc Merge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-dev am: 3b47afe765 am: 910e447d96 
am: c49f5c83cb

* commit 'c49f5c83cb3cce265836da8ef32009ee7b8f1029':
  [DO NOT MERGE] EAP-TLS PMKID mismatch error
 2015-10-23 21:10:47 +00:00
Bryce Lee
02c51837af Merge "Add config flag for reloading supported profiles in bluetooth on enable." into cw-e-dev am: 434a1fd687 
am: 998afcb738

* commit '998afcb738e148f4f382f5e50df3241ec464d88c':
  Add config flag for reloading supported profiles in bluetooth on enable.
 2015-10-23 21:08:59 +00:00
xin He
c49f5c83cb Merge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-dev am: 3b47afe765 
am: 910e447d96

* commit '910e447d96732ad22582efb6cea08925dc21e55c':
  [DO NOT MERGE] EAP-TLS PMKID mismatch error
 2015-10-23 20:59:36 +00:00
Bryce Lee
998afcb738 Merge "Add config flag for reloading supported profiles in bluetooth on enable." into cw-e-dev 
am: 434a1fd687

* commit '434a1fd68754e554b331d26d0c684209eaa42fa9':
  Add config flag for reloading supported profiles in bluetooth on enable.
 2015-10-23 20:58:15 +00:00
xin He
910e447d96 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
 2015-10-23 20:53:48 +00:00
Bryce Lee
434a1fd687 Merge "Add config flag for reloading supported profiles in bluetooth on enable." into cw-e-dev 2015-10-23 20:52:44 +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
Bryce Lee
c17bbe0be2 Add config flag for reloading supported profiles in bluetooth on enable. 
Bug: 24977590
Change-Id: I9aa0db5f5488f1ad400f3c0be7d8055ed36725dc
 2015-10-23 12:32:07 -07:00
Ching Tzung Lin
d7f0a33bf1 Merge "Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on." into cw-e-dev am: e94b3ba099 
am: 9cae56e7b6

* commit '9cae56e7b6eb38f2f3d53831f5465e85e59f46d5':
  Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on.
 2015-10-23 18:26:56 +00:00
Adrian Roos
989b719e64 Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev am: 93a6b4c129 am: a53bbb652b 
am: 5e5f718d23

* commit '5e5f718d236234f3a4bc5826dc805b6b8c53283c':
  Revert "Revert "Track ashmem memory usage in Parcel""
 2015-10-23 18:25:02 +00:00
Dianne Hackborn
1d7d1e8282 Merge "DO NOT MERGE Fix issue #24118803: The screen doesn\'t turn off..." into mnc-dr-dev am: b32e020d23 am: 9161871f83 
am: 6ff08bd48c

* commit '6ff08bd48c3d8c15dcbf1d1591f747d3d56bd071':
  DO NOT MERGE Fix issue #24118803: The screen doesn't turn off...
 2015-10-23 18:23:06 +00:00
Ching Tzung Lin
9cae56e7b6 Merge "Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on." into cw-e-dev 
am: e94b3ba099

* commit 'e94b3ba0994d52eccc7f0ed797ee1b3541f3ae83':
  Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on.
 2015-10-23 18:13:01 +00:00
Ching Tzung Lin
e94b3ba099 Merge "Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on." into cw-e-dev 2015-10-23 18:05:52 +00:00
Adrian Roos
5e5f718d23 Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev am: 93a6b4c129 
am: a53bbb652b

* commit 'a53bbb652b875e02ce8e5cfd55591adeac033417':
  Revert "Revert "Track ashmem memory usage in Parcel""
 2015-10-23 17:38:17 +00:00
Adrian Roos
a53bbb652b 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""
 2015-10-23 17:29:13 +00: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
6ff08bd48c Merge "DO NOT MERGE Fix issue #24118803: The screen doesn\'t turn off..." into mnc-dr-dev am: b32e020d23 
am: 9161871f83

* commit '9161871f8374a3d3ec184dd1c716d117e06381c6':
  DO NOT MERGE Fix issue #24118803: The screen doesn't turn off...
 2015-10-23 17:19:47 +00:00
Miao Wang
b60105d041 Merge "[RenderScript] Add null check for return values of JNI Get<TYPE>ArrayElements." am: 773756eeed 
am: 84d6e555f3

* commit '84d6e555f33d7d5f6383525d036ef21a5d166b31':
  [RenderScript] Add null check for return values of JNI Get<TYPE>ArrayElements.
 2015-10-23 17:14:17 +00:00
Dianne Hackborn
9161871f83 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...
 2015-10-23 17:09:45 +00:00
Miao Wang
84d6e555f3 Merge "[RenderScript] Add null check for return values of JNI Get<TYPE>ArrayElements." 
am: 773756eeed

* commit '773756eeed21f67fa7f7eabc663df46c789129aa':
  [RenderScript] Add null check for return values of JNI Get<TYPE>ArrayElements.
 2015-10-23 17:05:12 +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
Miao Wang
773756eeed Merge "[RenderScript] Add null check for return values of JNI Get<TYPE>ArrayElements." 2015-10-23 17:00:31 +00:00
Andreas Gampe
b61fd4fae2 Merge "Revert "libs: add libpackagelistparser"" am: e3da6ba5dd 
am: 314e1e00d8

* commit '314e1e00d812e4edf426a46726a2127c563048a5':
  Revert "libs: add libpackagelistparser"
 2015-10-23 04:24:05 +00:00
Andreas Gampe
314e1e00d8 Merge "Revert "libs: add libpackagelistparser"" 
am: e3da6ba5dd

* commit 'e3da6ba5dd29002789a76dafdc14987c51d92ea5':
  Revert "libs: add libpackagelistparser"
 2015-10-23 04:16:20 +00:00
Andreas Gampe
e3da6ba5dd Merge "Revert "libs: add libpackagelistparser"" 2015-10-23 03:46:40 +00:00
Sungmin Choi
9bd6b23111 Remove tether_apndata for Sasktel am: a665ea7207 am: af745653d0 
am: b932dc5253

* commit 'b932dc5253fa27ec54e7aeeba12307adb3965df3':
  Remove tether_apndata for Sasktel
 2015-10-23 03:38:20 +00:00
Sungmin Choi
b932dc5253 Remove tether_apndata for Sasktel am: a665ea7207 
am: af745653d0

* commit 'af745653d0809d7f9545cebf8727ea8c75990fd1':
  Remove tether_apndata for Sasktel
 2015-10-23 03:33:29 +00:00
Sungmin Choi
af745653d0 Remove tether_apndata for Sasktel 
am: a665ea7207

* commit 'a665ea72075dbaa5a86f866ee6c8df5a80f1ced3':
  Remove tether_apndata for Sasktel
 2015-10-23 03:26:18 +00:00
Andreas Gampe
ce969123b1 Revert "libs: add libpackagelistparser" 
This reverts commit dc06bb0752c1bc3e87b04a097b308bca1bc86181.

This should go into system/core.

Change-Id: Idf304ac5ccd4bcc86722f65688e3ee6284452287
 2015-10-22 19:50:09 -07: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
Daniel Cashman
a2dbc1cea3 Merge "libs: add libpackagelistparser" am: cc7373eafd 
am: 188e8875db

* commit '188e8875db1a55a6bafc8e8ef741400baab6e6fb':
  libs: add libpackagelistparser
 2015-10-22 23:38:40 +00:00
Daniel Cashman
188e8875db Merge "libs: add libpackagelistparser" 
am: cc7373eafd

* commit 'cc7373eafd0d5be7df8898748a700b47298ebf10':
  libs: add libpackagelistparser
 2015-10-22 23:12:49 +00:00
Daniel Cashman
cc7373eafd Merge "libs: add libpackagelistparser" 2015-10-22 23:03:51 +00:00
Ian Pedowitz
d3511518f9 Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev am: 09fd4ecf90 am: b402735fc0 
am: 07129d53b5

* commit '07129d53b5380ec556fa14c7506a26b6776e629a':
  Revert "Track ashmem memory usage in Parcel"
 2015-10-22 22:46:06 +00:00
Ian Pedowitz
07129d53b5 Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev am: 09fd4ecf90 
am: b402735fc0

* commit 'b402735fc0eb246233814bce76118fba99bb9f87':
  Revert "Track ashmem memory usage in Parcel"
 2015-10-22 22:38:56 +00:00
Ian Pedowitz
b402735fc0 Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev 
am: 09fd4ecf90

* commit '09fd4ecf90c7ae2536a6848e8c88c4878e0e0c24':
  Revert "Track ashmem memory usage in Parcel"
 2015-10-22 22:32:37 +00:00
Ian Pedowitz
09fd4ecf90 Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev 2015-10-22 22:26:32 +00:00
Ching Tzung Lin
9c57af4c5a Factor chin size into dimension checking to determine if 
CircularDisplayMask can be turned on.

Bug:24797866
Change-Id: I1b8061a8d00dca1877c1360f6fab228a1d72a70a
 2015-10-22 15:14:48 -07: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
e1be56cdff Merge "Don\'t resolve cross-profile app links without intent picker." into mnc-dr-dev am: 6666b29cf7 am: f31628f58b 
am: d7688f5933

* commit 'd7688f593327929e2bc42989236b62ddecf5e8b5':
  Don't resolve cross-profile app links without intent picker.
 2015-10-22 20:49:46 +00:00
Nicolas Prévot
d7688f5933 Merge "Don\'t resolve cross-profile app links without intent picker." into mnc-dr-dev am: 6666b29cf7 
am: f31628f58b

* commit 'f31628f58b97f99133b760b4c34d2ff6f4e456d0':
  Don't resolve cross-profile app links without intent picker.
 2015-10-22 20:43:32 +00:00