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

213061 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Sandler
a540cbd00f 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 
am: 06eb98c04d

* commit '06eb98c04d82cd7f6094aca738fc449d4f8af3fd':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-24 01:21:05 +00:00
Dan Sandler
4c8049f20c Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e am: 6c3186ea07 -s ours am: ab4857790b am: d9a96ff747 am: e41b3b35b5 
am: 681a397716

* commit '681a397716eaf8acb6a061e933ef9f159b9b1db7':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-24 00:59:05 +00:00
Dan Sandler
06eb98c04d 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
 2015-10-24 00:58:58 +00: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
681a397716 Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e am: 6c3186ea07 -s ours am: ab4857790b am: d9a96ff747 
am: e41b3b35b5

* commit 'e41b3b35b51431e897847e8b6646c27def5f573b':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-24 00:44:27 +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
e41b3b35b5 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
 2015-10-24 00:33:33 +00:00
Dan Sandler
170e9d17ec Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 446dcc9ed7 am: 4db8c18755 am: 5da8453866 
am: 625c731ccd

* commit '625c731ccd412aaa5d2c8e4a67733e1cc9d1ef38':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-24 00:15:55 +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
625c731ccd Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 446dcc9ed7 am: 4db8c18755 
am: 5da8453866

* commit '5da84538668c03b61ff31ceb679f4f3b12726351':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-24 00:04:16 +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
5da8453866 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
 2015-10-23 23:49:43 +00:00
Kenny Root
6938fbf3a5 Merge "Add Workman keyboard layout" am: 9a65c36022 
am: b0cc47efe5

* commit 'b0cc47efe5d7c200fe7d527c8c17d0854dfe3d35':
  Add Workman keyboard layout
 2015-10-23 23:49:39 +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
Kenny Root
b0cc47efe5 Merge "Add Workman keyboard layout" 
am: 9a65c36022

* commit '9a65c36022482d7fd4217e537fa434cc79b69f39':
  Add Workman keyboard layout
 2015-10-23 23:39:24 +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
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