Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
127,789 Commits 3 Branches 0 Tags
96cd3e690c5becd4a730a36ad4347e292eabd69e
Commit Graph

34638 Commits

Author SHA1 Message Date
Jessica Hummel
96cd3e690c am f1c90440: Merge "Standardize the provisioning intent action." 
* commit 'f1c9044057bdffbedbe3c2cae1a7b378d593ef2b':
  Standardize the provisioning intent action.
 2014-03-17 11:04:44 -07:00
Jessica Hummel
03dd22079c Standardize the provisioning intent action. 
Change-Id: Iea7f8827cf4b52e2e97e8675687412108dd917e4
 2014-03-17 16:53:27 +00:00
Jaewan Kim
5afda1a9c1 am f207ec76: Merge "EthernetDataTracker: Update hardware address when interface is changed" 
* commit 'f207ec76a51c96a72b7d972636dfa8f9e658fc92':
  EthernetDataTracker: Update hardware address when interface is changed
 2014-03-16 03:25:51 -07:00
Jaewan Kim
f207ec76a5 Merge "EthernetDataTracker: Update hardware address when interface is changed" 2014-03-16 10:23:35 +00:00
John Reck
094c09a4f9 am e2d3f28e: Merge "Revert "Rename DisplayList->RenderNode"" 
* commit 'e2d3f28e85e59f50bbab548d3c449de0b91be3ba':
  Revert "Rename DisplayList->RenderNode"
 2014-03-14 19:17:22 -07:00
John Reck
e2d3f28e85 Merge "Revert "Rename DisplayList->RenderNode"" 2014-03-15 02:15:34 +00:00
John Reck
31f9458908 Revert "Rename DisplayList->RenderNode" 
Missed some test(s), reverting to fix build

This reverts commit ef09d8cf94.

Change-Id: Ifee6c694e5f4b962d03dee200ccbf8dc9662e666
 2014-03-15 02:14:53 +00:00
John Reck
377be263e0 am 759067f3: Merge "Rename DisplayList->RenderNode" 
* commit '759067f39a635b4c821fc17b56253bcd056ada47':
  Rename DisplayList->RenderNode
 2014-03-14 17:28:16 -07:00
John Reck
759067f39a Merge "Rename DisplayList->RenderNode" 2014-03-15 00:25:34 +00:00
Ruben Brunk
94fb752026 am 38900b15: Merge "hal3: Add availableHotPixelModes, update modes." 
* commit '38900b15544e03aa8252022dc4b939748772ed6b':
  hal3: Add availableHotPixelModes, update modes.
 2014-03-14 17:16:55 -07:00
Ruben Brunk
38900b1554 Merge "hal3: Add availableHotPixelModes, update modes." 2014-03-15 00:14:56 +00:00
John Reck
ef09d8cf94 Rename DisplayList->RenderNode 
Change-Id: I1628b6e802252c001ca09ba762f52453b68f4cad
 2014-03-14 17:14:16 -07:00
Craig Mautner
4309121311 am 421a1dd1: Merge "Launch new tasks with Doc Centric flag." 
* commit '421a1dd197a78b014cb9a899a75c0fa43510a59a':
  Launch new tasks with Doc Centric flag.
 2014-03-14 14:45:05 -07:00
Craig Mautner
421a1dd197 Merge "Launch new tasks with Doc Centric flag." 2014-03-14 21:43:28 +00:00
Craig Mautner
d00f47402c Launch new tasks with Doc Centric flag. 
Introduction of new Intent flag FLAG_ACTIVITY_NEW_DOCUMENT. When
this flag is set the target activity will be launched in its own
task. This is the start of the new Doc Centric mode of working.

Change-Id: I719168532134ab2c5ea3300df676c2b2a0e81795
 2014-03-14 14:42:23 -07:00
Tim Kilbourn
3f11526c77 am 9b18001a: am ec033943: am 9873e099: am 55740325: Merge "Add leanback device features." into klp-modular-dev 
* commit '9b18001ab53c8c78aee0647983adf3ad8a1ee97c':
  Add leanback device features.
 2014-03-14 13:54:37 -07:00
Tim Kilbourn
9b18001ab5 am ec033943: am 9873e099: am 55740325: Merge "Add leanback device features." into klp-modular-dev 
* commit 'ec0339437869ebb42a67a2811dc6de31239d5d62':
  Add leanback device features.
 2014-03-14 20:50:40 +00:00
Tim Kilbourn
9873e099c3 am 55740325: Merge "Add leanback device features." into klp-modular-dev 
* commit '557403250b9accf4f17ab87f636f1722949960a3':
  Add leanback device features.
 2014-03-14 20:42:18 +00:00
Tim Kilbourn
557403250b Merge "Add leanback device features." into klp-modular-dev 2014-03-14 20:38:51 +00:00
Ruben Brunk
9d454fd609 hal3: Add availableHotPixelModes, update modes. 
Bug: 12957573
Change-Id: I2fd6ef60bf98c53288c2bc343d82a06602474916
 2014-03-14 13:35:57 -07:00
Christopher Tate
8a60d3e76d am 5e0e7b56: Merge "Make RegisteredServicesCache understand ASEC-based updates" 
* commit '5e0e7b56a98ecf8e13100b4b6c7e2c2a64c3d938':
  Make RegisteredServicesCache understand ASEC-based updates
 2014-03-14 12:18:51 -07:00
Christopher Tate
5e0e7b56a9 Merge "Make RegisteredServicesCache understand ASEC-based updates" 2014-03-14 19:16:07 +00:00
John Spurlock
6063f98d3c am 30672787: am dc28dc63: am 399cac5b: am 75985bbe: am 62826f55: am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs 
* commit '30672787d280aca74fdb8e5d6b354d58e0546b04':
  Fix doc typos in AppOpsManager.java
 2014-03-14 10:59:45 -07:00
Svetoslav
ed53788040 am 353e0cf7: am 78a06696: am 90119082: am 358eaa78: am fc1d0471: am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev 
* commit '353e0cf71885909ac7062fdb09f42b9682359593':
  PrintSpooler crash if printer is reported to have only one color mode.
 2014-03-14 10:59:36 -07:00
John Spurlock
30672787d2 am dc28dc63: am 399cac5b: am 75985bbe: am 62826f55: am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs 
* commit 'dc28dc63a7c04dcb87e257700a1d7aea40de0ce3':
  Fix doc typos in AppOpsManager.java
 2014-03-14 17:53:53 +00:00
Svetoslav
353e0cf718 am 78a06696: am 90119082: am 358eaa78: am fc1d0471: am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev 
* commit '78a06696b714dd97076b98a415aadcc174fe3af0':
  PrintSpooler crash if printer is reported to have only one color mode.
 2014-03-14 17:53:41 +00:00
John Spurlock
399cac5b33 am 75985bbe: am 62826f55: am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs 
* commit '75985bbe2f04519cc663db7ad54e8e69f3eabfc0':
  Fix doc typos in AppOpsManager.java
 2014-03-14 16:32:24 +00:00
JP Abgrall
7238585e2e am 4f261396: am 4ecd833e: am 7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev 
* commit '4f26139661b0039cff5e570975e6bf9b0bbce1af':
  ConnectivityService: add support to set TCP initial rwnd
 2014-03-14 16:32:21 +00:00
Chad Brubaker
4b59883afd am 7c2b1625: am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev 
* commit '7c2b1625d66d3c80c313160f78c8bccd9499539e':
  Remove SO_BINDTODEVICE from VPN protect
 2014-03-14 16:32:18 +00:00
Svetoslav
9011908230 am 358eaa78: am fc1d0471: am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev 
* commit '358eaa7825140ee571a7b9d61705fb3adb5b60aa':
  PrintSpooler crash if printer is reported to have only one color mode.
 2014-03-14 16:32:15 +00:00
John Spurlock
75985bbe2f am 62826f55: am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs 
* commit '62826f55be4415684b4e321469298ba43d598bbb':
  Fix doc typos in AppOpsManager.java
 2014-03-14 16:28:15 +00:00
JP Abgrall
4f26139661 am 4ecd833e: am 7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev 
* commit '4ecd833ee35d1120f8c1ae52367947cacfc263a4':
  ConnectivityService: add support to set TCP initial rwnd
 2014-03-14 16:28:09 +00:00
Chad Brubaker
7c2b1625d6 am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev 
* commit '78f204aed8c0f3c8174616801d66f96a9a00a5fd':
  Remove SO_BINDTODEVICE from VPN protect
 2014-03-14 16:27:58 +00:00
Svetoslav
358eaa7825 am fc1d0471: am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev 
* commit 'fc1d04714e9042a1b01c7a725fafa1820b8c14fb':
  PrintSpooler crash if printer is reported to have only one color mode.
 2014-03-14 16:27:55 +00:00
Jose Lima
a5b61d39ce am 92703e62: resolved conflicts for merge of 4882ddfa to master 
* commit '92703e62c1dc88a410a32b05c2d44f391c193140':
  Add banner attribute to app manifest
 2014-03-13 21:30:03 -07:00
Jose Lima
92703e62c1 resolved conflicts for merge of 4882ddfa to master 
Change-Id: I179899697c148ac34a67b195e2dbd3df2f9138de
 2014-03-13 21:26:48 -07:00
Adam Powell
6cde6c75b3 am 41685ce9: am 898d6d96: am 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev 
* commit '41685ce983abd6b4ccbb0ae8043d6a1dc118f7d3':
  Add a config override for ViewConfiguration#hasPermanentMenuKey
 2014-03-13 23:57:19 +00:00
Adam Powell
41685ce983 am 898d6d96: am 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev 
* commit '898d6d964cb3b650b5c9bed2276310547e5455e0':
  Add a config override for ViewConfiguration#hasPermanentMenuKey
 2014-03-13 23:53:38 +00:00
John Spurlock
62826f55be am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs 
* commit 'f6228d95eae7b05dd0015b3062e72c89148e65a2':
  Fix doc typos in AppOpsManager.java
 2014-03-13 22:14:57 +00:00
John Reck
0b55ac30ca am 19caf396: Merge "App compat" 
* commit '19caf39612a574672169402d79be4d161b122290':
  App compat
 2014-03-13 15:09:31 -07:00
John Reck
19caf39612 Merge "App compat" 2014-03-13 22:06:23 +00:00
Tim Kilbourn
f94b6a93a4 Add leanback device features. 
android.software.leanback - the device supports leanback UIs.
android.software.leanback_only - the device ONLY supports leanback UIs.

leanback_only is a hidden feature for now.

Change-Id: I497bd96464125ad81212c804e150f210f3e95af2
 2014-03-13 15:02:54 -07:00
John Reck
40503f9f8c App compat 
Bug: 13450310

Change-Id: I32d948a243385d1bb9f2615759127f4b13ce01bd
 2014-03-13 14:53:13 -07:00
JP Abgrall
4ecd833ee3 am 7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev 
* commit '7baa7c804501b9cbcb5de281c5ddfaf03ba08f7a':
  ConnectivityService: add support to set TCP initial rwnd
 2014-03-13 20:36:51 +00:00
JP Abgrall
7baa7c8045 Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev 2014-03-13 20:33:44 +00:00
Ruben Brunk
c803300002 am dba76442: Merge "camera3: Pass vendor tags through binder." 
* commit 'dba764426b1657b84a2fb88690be7be34498bd09':
  camera3: Pass vendor tags through binder.
 2014-03-13 13:20:45 -07:00
Ruben Brunk
dba764426b Merge "camera3: Pass vendor tags through binder." 2014-03-13 20:18:37 +00:00
Ruben Brunk
85c4388de1 camera3: Pass vendor tags through binder. 
Bug: 12134423

Change-Id: Icef3fe9e67160767bdb8244ac49c85b68b497123
 2014-03-13 12:14:49 -07:00
Chad Brubaker
7f68f7f4a1 am f5729a6a: am 1011960c: am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev 
* commit 'f5729a6a1573ba27f69a5c5dc144be3f8f60b026':
  Add the calling package name to requestRouteToHost
 2014-03-13 18:22:57 +00:00
Chad Brubaker
f5729a6a15 am 1011960c: am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev 
* commit '1011960c44a4f84d53d05199fe1ca09be9473822':
  Add the calling package name to requestRouteToHost
 2014-03-13 18:18:36 +00:00