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

197616 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zach Johnson
26b21a6cef am ea9f961c: am d56958c4: Merge "Ignore carrier apps when checking for idleness" into mnc-dev 
* commit 'ea9f961ce22c7d0784506beb608714401b8079e9':
  Ignore carrier apps when checking for idleness
 2015-06-09 00:24:42 +00:00
Selim Cinek
08bb363b70 am 9a9c34d3: am 196597b7: Merge "Children which are removed when HUNd now animate out" into mnc-dev 
* commit '9a9c34d3d686898a337ea42f8543ba1b869181c8':
  Children which are removed when HUNd now animate out
 2015-06-09 00:24:37 +00:00
Zach Johnson
ea9f961ce2 am d56958c4: Merge "Ignore carrier apps when checking for idleness" into mnc-dev 
* commit 'd56958c440dffd85349adee5ca0bf4d0893215c6':
  Ignore carrier apps when checking for idleness
 2015-06-09 00:16:01 +00:00
Selim Cinek
9a9c34d3d6 am 196597b7: Merge "Children which are removed when HUNd now animate out" into mnc-dev 
* commit '196597b7c09fce62276099292bb0e3d0572fe4a5':
  Children which are removed when HUNd now animate out
 2015-06-09 00:11:13 +00:00
Prerepa Viswanadham
ab44792723 am c165e1d8: am 8711ed64: Merge changes from topic \'modemActivityInfo\' into mnc-dev 
* commit 'c165e1d88c807c83f51424875a447fcf8945bbcf':
  API for get modem activity info
  Activity info and stats from modem
 2015-06-09 00:07:35 +00:00
Zach Johnson
d56958c440 Merge "Ignore carrier apps when checking for idleness" into mnc-dev 2015-06-09 00:06:29 +00:00
Selim Cinek
196597b7c0 Merge "Children which are removed when HUNd now animate out" into mnc-dev 2015-06-09 00:00:06 +00:00
Prerepa Viswanadham
c165e1d88c am 8711ed64: Merge changes from topic \'modemActivityInfo\' into mnc-dev 
* commit '8711ed644bab42c03ab9a22c14e1cb2825a107a6':
  API for get modem activity info
  Activity info and stats from modem
 2015-06-08 23:57:57 +00:00
Prerepa Viswanadham
8711ed644b Merge changes from topic 'modemActivityInfo' into mnc-dev 
* changes:
  API for get modem activity info
  Activity info and stats from modem
 2015-06-08 23:44:51 +00:00
Adam Lesinski
e4768b4207 am 2ce589b1: am 4cf59747: Merge "Bump the BatteryStats parcel VERSION" into mnc-dev 
* commit '2ce589b1dbba5bb25cb00de773a2275cec636829':
  Bump the BatteryStats parcel VERSION
 2015-06-08 23:41:07 +00:00
Yang Ni
4afa7f4d8b am 8bcc22da: am 1052ae00: Merge "Fixed ScriptGroup for outputs to globals" 
* commit '8bcc22da6ee23ce24bd6a2760234a965a0d1e9c6':
  Fixed ScriptGroup for outputs to globals
 2015-06-08 23:35:40 +00:00
Adam Lesinski
2ce589b1db am 4cf59747: Merge "Bump the BatteryStats parcel VERSION" into mnc-dev 
* commit '4cf59747f8e23b1d23ee7450541e34826dccbd4f':
  Bump the BatteryStats parcel VERSION
 2015-06-08 23:25:40 +00:00
Yang Ni
8bcc22da6e am 1052ae00: Merge "Fixed ScriptGroup for outputs to globals" 
* commit '1052ae00f1c23d9c8e6177cf0469236767de622f':
  Fixed ScriptGroup for outputs to globals
 2015-06-08 23:18:49 +00:00
Dongwon Kang
6e05be3c94 am fc5d7663: am 0dd7ddc4: Merge "Make MediaProjectionPermissionActivity secure with setFilterTouchesWhenObscured()" into mnc-dev 
* commit 'fc5d76637cbf764a40dd91674bb1f513b298f66f':
  Make MediaProjectionPermissionActivity secure with setFilterTouchesWhenObscured()
 2015-06-08 23:18:09 +00:00
John Reck
b3c5e5854f am 6309b5f7: am 62043203: Merge "Delete unused" into mnc-dev 
* commit '6309b5f74c7ce9ff9d728cbf672ff8d4bfbe01e0':
  Delete unused
 2015-06-08 23:18:04 +00:00
Adam Lesinski
4cf59747f8 Merge "Bump the BatteryStats parcel VERSION" into mnc-dev 2015-06-08 23:14:17 +00:00
Yang Ni
1052ae00f1 Merge "Fixed ScriptGroup for outputs to globals" 2015-06-08 23:08:11 +00:00
Dongwon Kang
fc5d76637c am 0dd7ddc4: Merge "Make MediaProjectionPermissionActivity secure with setFilterTouchesWhenObscured()" into mnc-dev 
* commit '0dd7ddc414971732b962352c7ad4a8fb111272c4':
  Make MediaProjectionPermissionActivity secure with setFilterTouchesWhenObscured()
 2015-06-08 23:05:49 +00:00
John Reck
6309b5f74c am 62043203: Merge "Delete unused" into mnc-dev 
* commit '62043203df362addaf1692657dde1993d88d9b52':
  Delete unused
 2015-06-08 23:05:44 +00:00
Dongwon Kang
0dd7ddc414 Merge "Make MediaProjectionPermissionActivity secure with setFilterTouchesWhenObscured()" into mnc-dev 2015-06-08 22:58:56 +00:00
John Reck
62043203df Merge "Delete unused" into mnc-dev 2015-06-08 22:51:43 +00:00
Jonathan Basseri
d441f0bb97 am 3efdf81d: am 623bf636: Merge "Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId" into mnc-dev 
* commit '3efdf81da089a4c6604c798a1abedb4fce70ee60':
  Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId
 2015-06-08 22:50:06 +00:00
John Reck
4538ef2abc Delete unused 
Change-Id: If27e1eb8e42313eae14df58a24ca54fafb2992fa
 2015-06-08 15:45:58 -07:00
Jonathan Basseri
3efdf81da0 am 623bf636: Merge "Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId" into mnc-dev 
* commit '623bf636de8f6f53ffa46127ed3fa5477be0a094':
  Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId
 2015-06-08 22:35:38 +00:00
Jonathan Basseri
623bf636de Merge "Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId" into mnc-dev 2015-06-08 22:27:34 +00:00
Filip Gruszczynski
d2bc8af5b3 am 3370b6c9: am 5e4c382d: resolved conflicts for merge of 17ba2e6c to mnc-dev 
* commit '3370b6c95e153c3c665e38f6f9b5d105da2949d7':
  Calculate outsets before window frame adjustment.
 2015-06-08 22:27:17 +00:00
Filip Gruszczynski
3370b6c95e am 5e4c382d: resolved conflicts for merge of 17ba2e6c to mnc-dev 
* commit '5e4c382d15968c757fb9c5783cbd420156ea8ad2':
  Calculate outsets before window frame adjustment.
 2015-06-08 22:14:38 +00:00
Yang Ni
d9f5f0269d Fixed ScriptGroup for outputs to globals 
b/21187932

Dependency from one kernel to another kernel -- where one reads the
other's output to a global allocation -- was not handled correctly.
This CL fixed that. Needed to make a new CTS test pass.

Change-Id: I500f9cac9d89bcaec7c186e942ba4a7d413daadb
(cherry picked from commit 85858718c0fc8f4f17ee18e5d62ec0614a8bc780)
 2015-06-08 15:08:19 -07:00
Adam Lesinski
df6235cd76 Bump the BatteryStats parcel VERSION 
A previous change forgot to bump the version, leading to
corrupt data.

Bug:19683715
Bug:21574065
Change-Id: I30c9039694b02d576909e8f60c25f175986b8c5c
 2015-06-08 15:04:16 -07:00
Filip Gruszczynski
5e4c382d15 resolved conflicts for merge of 17ba2e6c to mnc-dev 
Change-Id: I9177f0e994e1e8fba02faf5a13f2dcec950ec5e0
 2015-06-08 15:00:25 -07:00
Jonathan Basseri
5ea0c8f1c6 Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId 
Per discussion with API council, "notify" makes more sense than "reload"
here.

Bug: 21571894
Change-Id: I7e8e8d91d8e6e6d4502cf371472fd82efa3e97f5
 2015-06-08 14:59:09 -07:00
John Spurlock
780ff525bb am c2fbbcc7: am e37cf3b8: Merge "QS: Handle font-size changes immediately in ZenModePanel." into mnc-dev 
* commit 'c2fbbcc7976826ca0e12e437dbbdf8702cc2ebf4':
  QS: Handle font-size changes immediately in ZenModePanel.
 2015-06-08 21:23:23 +00:00
Joseph Wen
d7d67fce77 am 970b9c2a: am d8ffe624: Merge "Update Statement Service." into mnc-dev 
* commit '970b9c2ac1bb4448288e0a5ef4bd7e1b1d9573f0':
  Update Statement Service.
 2015-06-08 21:23:17 +00:00
Geoff Mendal
e42aebb961 am 5911363f: (-s ours) am 59b28c0c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '5911363fadef766547979c6568dec2bf282336b6':
  Import translations. DO NOT MERGE
 2015-06-08 21:23:13 +00:00
Dongwon Kang
b0cf7ea65d Make MediaProjectionPermissionActivity secure with setFilterTouchesWhenObscured() 
Bug: 21485727
Change-Id: I6b639464a3543dec4d7a248bdd8042b2c3872fac
 2015-06-08 14:16:54 -07:00
John Spurlock
c2fbbcc797 am e37cf3b8: Merge "QS: Handle font-size changes immediately in ZenModePanel." into mnc-dev 
* commit 'e37cf3b8d614019c5570f945110bfbc5a8b09713':
  QS: Handle font-size changes immediately in ZenModePanel.
 2015-06-08 21:12:29 +00:00
Joseph Wen
970b9c2ac1 am d8ffe624: Merge "Update Statement Service." into mnc-dev 
* commit 'd8ffe624b22a289b4f87af84acb05327b7818e53':
  Update Statement Service.
 2015-06-08 21:05:25 +00:00
Geoff Mendal
5911363fad am 59b28c0c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '59b28c0c9cff7eda3974ae861c550c3d37af6412':
  Import translations. DO NOT MERGE
 2015-06-08 21:05:21 +00:00
John Spurlock
e37cf3b8d6 Merge "QS: Handle font-size changes immediately in ZenModePanel." into mnc-dev 2015-06-08 21:03:57 +00:00
Joseph Wen
d8ffe624b2 Merge "Update Statement Service." into mnc-dev 2015-06-08 20:56:25 +00:00
Geoff Mendal
59b28c0c9c Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-08 20:53:03 +00:00
Etan Cohen
dd8ed09397 am 03609df3: am 76316977: Merge "Update documentation of CARRIER_PRESENCE & bitmasks." into mnc-dev 
* commit '03609df355228390a98d5669cb1a53e83f8343a9':
  Update documentation of CARRIER_PRESENCE & bitmasks.
 2015-06-08 20:51:59 +00:00
Zach Johnson
b4b9ca7580 Ignore carrier apps when checking for idleness 
Also introduce a way to check if a package has
carrier privileges for any active phone.

Change-Id: If5c5fe07f05ffc90fc21431eb27cf48030c0175b
 2015-06-08 13:49:13 -07:00
Etan Cohen
03609df355 am 76316977: Merge "Update documentation of CARRIER_PRESENCE & bitmasks." into mnc-dev 
* commit '7631697793a8b82bb2a1cd3adced1b140d266427':
  Update documentation of CARRIER_PRESENCE & bitmasks.
 2015-06-08 20:39:40 +00:00
Wale Ogunwale
152b03e852 am 549ac692: am d8b9b642: Merge "Use DisplayAdjustments when creating display in ResourceManager" into mnc-dev 
* commit '549ac6925a28bf185515334a99cffb2048f0708a':
  Use DisplayAdjustments when creating display in ResourceManager
 2015-06-08 20:37:43 +00:00
John Spurlock
c3cd6f46b5 am 50e98a33: am c0f7aff3: Merge "Zen QS: Use explicit content descriptions for zen buttons." into mnc-dev 
* commit '50e98a33ec1f99d50417b3b0c79c946e6e367bd8':
  Zen QS: Use explicit content descriptions for zen buttons.
 2015-06-08 20:37:37 +00:00
keunyoung
b7145b14d6 am b7ee0ba4: am 7da9d7aa: Merge "apply force hiding of window only when it is main display" into mnc-dev 
* commit 'b7ee0ba43b95fa1462b241ac6e46d1eb853dfa3c':
  apply force hiding of window only when it is main display
 2015-06-08 20:37:32 +00:00
Etan Cohen
7631697793 Merge "Update documentation of CARRIER_PRESENCE & bitmasks." into mnc-dev 2015-06-08 20:29:14 +00:00
John Spurlock
d896323eab QS: Handle font-size changes immediately in ZenModePanel. 
And make sure the condition row is tall enough to accomodate
huge text.

Bug: 20346315
Change-Id: I9346f80edd7f0069d6363fe5377b36b0bf5aca62
 2015-06-08 16:26:12 -04:00
Nathan Harold
87ad31f3ff am 48f193a8: am 71feb72b: Merge "Fix a typo in the docstring of getAllCellInfo()" into mnc-dev 
* commit '48f193a85987e88d859359fc63603c1c9ee8b441':
  Fix a typo in the docstring of getAllCellInfo()
 2015-06-08 20:21:48 +00:00