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

174016 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
73985b60e6 am 98cfc9e3: am fc7ebb93: am b0791173: Merge "Add some flags to reduce memory usage on svelte devices." into lmp-mr1-dev 
* commit '98cfc9e36cf614abf2648188a123b7c481aa85c3':
  Add some flags to reduce memory usage on svelte devices.
 2014-11-18 02:31:41 +00:00
xinhe
e489ed4769 am 5f1188c3: am b596bffd: am a8e6d6fd: Merge "air plane mode only send to the owner through the quick setting" into lmp-mr1-dev 
* commit '5f1188c3f65759751059493ee2a071ead2fd74c6':
  air plane mode only send to the owner through the quick setting
 2014-11-18 02:31:36 +00:00
Robert Greenwalt
38c30b4ba7 am b02d54fd: am aeb8dc16: am 5e4e2b58: Merge "telephony: Add tethering profiles to support mvno" into lmp-mr1-dev 
* commit 'b02d54fd6da8ddcd501a1ea691e5b1408b23355a':
  telephony: Add tethering profiles to support mvno
 2014-11-18 02:31:32 +00:00
Robert Greenwalt
699e2fe264 am 15f09d20: am 33c34d6c: am 9a53c113: Merge "telephony: Change string to string-array config_tether_apndata to support mvno" into lmp-mr1-dev 
* commit '15f09d20311278fc73c477cd45400e41965dd05f':
  telephony: Change string to string-array config_tether_apndata to support mvno
 2014-11-18 02:31:27 +00:00
Andres Morales
1fdb441d43 am 046c7b2d: am e261ede8: am 5aadd5b6: Merge "Add UserHandle to BeamShareData" into lmp-mr1-dev 
* commit '046c7b2d553fb59f3520073380fce89cfa960e2d':
  Add UserHandle to BeamShareData
 2014-11-18 02:31:22 +00:00
Winson Chung
f290fed4dd am b14d5e30: am 5a812d4e: am fe79d62d: Merge "Adding additional null checks to prevent crash after task stack view callback is reset. (Bug 18376798)" into lmp-mr1-dev 
* commit 'b14d5e303ea8b6ff8f58743e9fe11e6789e78ff2':
  Adding additional null checks to prevent crash after task stack view callback is reset. (Bug 18376798)
 2014-11-18 02:31:17 +00:00
Geoff Mendal
2435e06d49 am bb12bfb1: (-s ours) am db590124: (-s ours) am 6e523a07: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'bb12bfb1a647ac2a30476b4585be5c9f3af28548':
  Import translations. DO NOT MERGE
 2014-11-18 02:31:13 +00:00
Craig Stout
b102119666 am e473ed7b: am 913f8295: am 36fbc437: Merge "Use dark theme for usb dialogs on television." into lmp-mr1-dev 
* commit 'e473ed7bdc31561332ee99b8211cf1fd5e3678f4':
  Use dark theme for usb dialogs on television.
 2014-11-18 02:31:07 +00:00
Jeff Davidson
19222147fc am 704b7521: am 0e784874: am 9a1da68b: Expose a SystemApi method to prepare a VPN without consent. 
* commit '704b7521b19d654c49c7804e6079aec3f2c69838':
  Expose a SystemApi method to prepare a VPN without consent.
 2014-11-18 02:31:02 +00:00
Jeff Davidson
c79924f741 am b431a198: am e6bc5adf: am e0cb56b0: Merge "Enforce VPN control "permission" with an actual permission." into lmp-mr1-dev 
* commit 'b431a198ec255be7efb30b4c81a779a4eb5009f6':
  Enforce VPN control "permission" with an actual permission.
 2014-11-18 02:30:54 +00:00
Winson Chung
98cfc9e36c am fc7ebb93: am b0791173: Merge "Add some flags to reduce memory usage on svelte devices." into lmp-mr1-dev 
* commit 'fc7ebb934ea83c9124797928d0061bda5f89df4f':
  Add some flags to reduce memory usage on svelte devices.
 2014-11-18 02:07:26 +00:00
xinhe
5f1188c3f6 am b596bffd: am a8e6d6fd: Merge "air plane mode only send to the owner through the quick setting" into lmp-mr1-dev 
* commit 'b596bffdaa7a9abf9110ca0d1ea90bdfca47c956':
  air plane mode only send to the owner through the quick setting
 2014-11-18 02:06:12 +00:00
Robert Greenwalt
b02d54fd6d am aeb8dc16: am 5e4e2b58: Merge "telephony: Add tethering profiles to support mvno" into lmp-mr1-dev 
* commit 'aeb8dc1673546a2852e493247b256c5df689a23e':
  telephony: Add tethering profiles to support mvno
 2014-11-18 02:06:05 +00:00
Robert Greenwalt
15f09d2031 am 33c34d6c: am 9a53c113: Merge "telephony: Change string to string-array config_tether_apndata to support mvno" into lmp-mr1-dev 
* commit '33c34d6c142213cd4fad857d604aa644a01e4e8b':
  telephony: Change string to string-array config_tether_apndata to support mvno
 2014-11-18 02:05:58 +00:00
Andres Morales
046c7b2d55 am e261ede8: am 5aadd5b6: Merge "Add UserHandle to BeamShareData" into lmp-mr1-dev 
* commit 'e261ede827664bdb0f115edb5af25e590a36557e':
  Add UserHandle to BeamShareData
 2014-11-18 02:05:51 +00:00
Winson Chung
b14d5e303e am 5a812d4e: am fe79d62d: Merge "Adding additional null checks to prevent crash after task stack view callback is reset. (Bug 18376798)" into lmp-mr1-dev 
* commit '5a812d4e6986e71121b6f8374e51b3ea5ef076ae':
  Adding additional null checks to prevent crash after task stack view callback is reset. (Bug 18376798)
 2014-11-18 02:05:46 +00:00
Geoff Mendal
bb12bfb1a6 am db590124: (-s ours) am 6e523a07: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'db5901244a6c64d9d042370fe6eff5ac89882568':
  Import translations. DO NOT MERGE
 2014-11-18 02:05:40 +00:00
Craig Stout
e473ed7bdc am 913f8295: am 36fbc437: Merge "Use dark theme for usb dialogs on television." into lmp-mr1-dev 
* commit '913f829549a60045b005f1a1adb6e8562ed47a1a':
  Use dark theme for usb dialogs on television.
 2014-11-18 02:05:35 +00:00
Jeff Davidson
704b7521b1 am 0e784874: am 9a1da68b: Expose a SystemApi method to prepare a VPN without consent. 
* commit '0e7848748256f4b5709a4c94882e20d96a86ae8e':
  Expose a SystemApi method to prepare a VPN without consent.
 2014-11-18 02:05:29 +00:00
Jeff Davidson
b431a198ec am e6bc5adf: am e0cb56b0: Merge "Enforce VPN control "permission" with an actual permission." into lmp-mr1-dev 
* commit 'e6bc5adf2d4639b63001a5889ad301bae47bcd7f':
  Enforce VPN control "permission" with an actual permission.
 2014-11-18 02:05:21 +00:00
Chih-hung Hsieh
f7d0b20e9e am cb82b7f1: am a58336f6: Merge "Use fabsf() rather than abs()" 
* commit 'cb82b7f1824dc7f9fa73c2bada7107c48290af8b':
  Use fabsf() rather than abs()
 2014-11-17 23:07:29 +00:00
Chih-hung Hsieh
af71ab2c7f am 804e2937: am 1615731d: Merge "Fix check for PROC_QUOTES mode" 
* commit '804e2937e16943609c46ca3fe0cdbefab29f4210':
  Fix check for PROC_QUOTES mode
 2014-11-17 23:07:25 +00:00
Winson Chung
fc7ebb934e am b0791173: Merge "Add some flags to reduce memory usage on svelte devices." into lmp-mr1-dev 
* commit 'b079117384c038e1c02fb58fefafcb2a72cb0cf3':
  Add some flags to reduce memory usage on svelte devices.
 2014-11-17 23:06:15 +00:00
Geoff Mendal
57083c544a am 7f6a191e: (-s ours) am df944b30: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '7f6a191e6e293181a081e22b8fa43bd9799bfec2':
  Import translations. DO NOT MERGE
 2014-11-17 23:02:08 +00:00
xinhe
b596bffdaa am a8e6d6fd: Merge "air plane mode only send to the owner through the quick setting" into lmp-mr1-dev 
* commit 'a8e6d6fd993c449b442be8c19f6c2688b75c018d':
  air plane mode only send to the owner through the quick setting
 2014-11-17 22:59:20 +00:00
Chih-hung Hsieh
cb82b7f182 am a58336f6: Merge "Use fabsf() rather than abs()" 
* commit 'a58336f6c8aa44373485e5a6d7ec32677387a935':
  Use fabsf() rather than abs()
 2014-11-17 22:59:11 +00:00
Robert Greenwalt
aeb8dc1673 am 5e4e2b58: Merge "telephony: Add tethering profiles to support mvno" into lmp-mr1-dev 
* commit '5e4e2b589e4a89cefced2b4d69e7f6cf68e26873':
  telephony: Add tethering profiles to support mvno
 2014-11-17 22:59:09 +00:00
Chih-hung Hsieh
804e2937e1 am 1615731d: Merge "Fix check for PROC_QUOTES mode" 
* commit '1615731d18b042d4c69dad3169166cce7a2a9fcf':
  Fix check for PROC_QUOTES mode
 2014-11-17 22:59:05 +00:00
Robert Greenwalt
33c34d6c14 am 9a53c113: Merge "telephony: Change string to string-array config_tether_apndata to support mvno" into lmp-mr1-dev 
* commit '9a53c1137b0a80544fb8ad330718cc8bd35be959':
  telephony: Change string to string-array config_tether_apndata to support mvno
 2014-11-17 22:58:56 +00:00
Andres Morales
e261ede827 am 5aadd5b6: Merge "Add UserHandle to BeamShareData" into lmp-mr1-dev 
* commit '5aadd5b6fa8ee9f09cd4870c8f104c1e611aebcd':
  Add UserHandle to BeamShareData
 2014-11-17 22:58:40 +00:00
Winson Chung
5a812d4e69 am fe79d62d: Merge "Adding additional null checks to prevent crash after task stack view callback is reset. (Bug 18376798)" into lmp-mr1-dev 
* commit 'fe79d62db3f5de7671763b4bbafc83feb1c7694c':
  Adding additional null checks to prevent crash after task stack view callback is reset. (Bug 18376798)
 2014-11-17 22:58:30 +00:00
Geoff Mendal
db5901244a am 6e523a07: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '6e523a077f3f6257019057091d8a962ff56fe882':
  Import translations. DO NOT MERGE
 2014-11-17 22:58:24 +00:00
Craig Stout
913f829549 am 36fbc437: Merge "Use dark theme for usb dialogs on television." into lmp-mr1-dev 
* commit '36fbc43787923da4e7b36761fa287a36e15dab29':
  Use dark theme for usb dialogs on television.
 2014-11-17 22:58:18 +00:00
Jeff Davidson
0e78487482 am 9a1da68b: Expose a SystemApi method to prepare a VPN without consent. 
* commit '9a1da68bf7980449a5ee5d6fa9d9686b04d667ff':
  Expose a SystemApi method to prepare a VPN without consent.
 2014-11-17 22:58:12 +00:00
Jeff Davidson
e6bc5adf2d am e0cb56b0: Merge "Enforce VPN control "permission" with an actual permission." into lmp-mr1-dev 
* commit 'e0cb56b02eb2bb52a537b32c5d3f5360b9718c8a':
  Enforce VPN control "permission" with an actual permission.
 2014-11-17 22:58:05 +00:00
Winson Chung
b079117384 Merge "Add some flags to reduce memory usage on svelte devices." into lmp-mr1-dev 2014-11-17 22:56:32 +00:00
Geoff Mendal
7f6a191e6e am df944b30: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'df944b30c2b2c69d7335b8a52959c05ed84e6fb1':
  Import translations. DO NOT MERGE
 2014-11-17 22:54:21 +00:00
Winson Chung
96d7041866 Add some flags to reduce memory usage on svelte devices. 
Bug: 10918599
Change-Id: I235413a243d47fdd9be4a27f6bd726311a51cb6f
 2014-11-17 14:52:29 -08:00
Chih-hung Hsieh
a58336f6c8 Merge "Use fabsf() rather than abs()" 2014-11-17 22:41:11 +00:00
Chih-hung Hsieh
1615731d18 Merge "Fix check for PROC_QUOTES mode" 2014-11-17 22:38:55 +00:00
xinhe
a8e6d6fd99 Merge "air plane mode only send to the owner through the quick setting" into lmp-mr1-dev 2014-11-17 22:18:11 +00:00
Bernhard Rosenkränzer
c44958c786 Use fabsf() rather than abs() 
abs() operates on integers -- to check floats accurately, fabsf
should be used.

Change-Id: I1a4e85f8f5e0d08ff38d307c5c31e2b6783ab7af
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
 2014-11-17 23:12:18 +01:00
Robert Greenwalt
5e4e2b589e Merge "telephony: Add tethering profiles to support mvno" into lmp-mr1-dev 2014-11-17 22:07:29 +00:00
Robert Greenwalt
9a53c1137b Merge "telephony: Change string to string-array config_tether_apndata to support mvno" into lmp-mr1-dev 2014-11-17 22:04:49 +00:00
Andres Morales
5aadd5b6fa Merge "Add UserHandle to BeamShareData" into lmp-mr1-dev 2014-11-17 21:53:58 +00:00
Geoff Mendal
4ebd29dd76 Merge "Import translations. DO NOT MERGE" 2014-11-17 21:47:02 +00:00
Geoff Mendal
760ad04984 Merge "Import translations. DO NOT MERGE" 2014-11-17 21:45:55 +00:00
Winson Chung
fe79d62db3 Merge "Adding additional null checks to prevent crash after task stack view callback is reset. (Bug 18376798)" into lmp-mr1-dev 2014-11-17 21:43:51 +00:00
Rob Tsuk
4f2e052f3d Merge "Fix uninitialized member warning" 2014-11-17 21:43:29 +00:00
Geoff Mendal
df944b30c2 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-17 21:42:48 +00:00