summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix the inconsistent name on @param and the real param.Derek Tan2014-02-131-3/+3
| | | | Change-Id: If9853e91f55c0be89cdf77ae7c4369f274a45bb6
* am d63b4314: Merge "Log history of location requests in LocationManager. ↵David Christie2014-02-133-8/+406
|\ | | | | | | | | | | | | -Assists with debugging power issues. Bug: 12824233" * commit 'd63b4314b85e982a1d70d4064af59851f476dd36': Log history of location requests in LocationManager. -Assists with debugging power issues. Bug: 12824233
| * Merge "Log history of location requests in LocationManager. -Assists with ↵David Christie2014-02-133-8/+406
| |\ | | | | | | | | | debugging power issues. Bug: 12824233"
| | * Log history of location requests in LocationManager.David Christie2014-02-033-8/+406
| | | | | | | | | | | | | | | | | | | | | -Assists with debugging power issues. Bug: 12824233 Change-Id: Iaaef0dbe00154c7668034a166587671b75d1f3c7
* | | am 6b1a93fc: am 3816fa8b: am 21ab13ff: am 474f1fbe: Merge "Don\'t null class ↵Craig Mautner2014-02-131-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | member before using it." into klp-modular-dev * commit '6b1a93fcb9551730583f1d3ea36dbfd5589859f3': Don't null class member before using it.
| * | am 3816fa8b: am 21ab13ff: am 474f1fbe: Merge "Don\'t null class member ↵Craig Mautner2014-02-131-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | before using it." into klp-modular-dev * commit '3816fa8beec3592360bf4ec1c4dde22c271b17f9': Don't null class member before using it.
| | * \ am 21ab13ff: am 474f1fbe: Merge "Don\'t null class member before using it." ↵Craig Mautner2014-02-131-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-modular-dev * commit '21ab13ff743fda1cec1923a8dec6b5553a514759': Don't null class member before using it.
| | | * \ am 474f1fbe: Merge "Don\'t null class member before using it." into ↵Craig Mautner2014-02-131-1/+1
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit '474f1fbe8d87563909c3cb69ec921d427cd1f0b0': Don't null class member before using it.
| | | | * \ Merge "Don't null class member before using it." into klp-modular-devCraig Mautner2014-02-131-1/+1
| | | | |\ \
| | | | | * | Don't null class member before using it.Craig Mautner2014-02-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing the order of detachStack() and usage of mDisplayContent fixes NPE. Fixes bug 12823709. Change-Id: I04760b1d6fd5d3ffc49b99ca4acb47bf7e61cb46
* | | | | | | am 3e5ce55f: am 4dd83975: am d14fa78d: am 0af894d2: Merge "Update DimLayer ↵Craig Mautner2014-02-134-43/+38
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sizes on rotation." into klp-modular-dev * commit '3e5ce55fdeb67271d6a32042ab14cf523446cc09': Update DimLayer sizes on rotation.
| * | | | | | am 4dd83975: am d14fa78d: am 0af894d2: Merge "Update DimLayer sizes on ↵Craig Mautner2014-02-134-43/+38
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rotation." into klp-modular-dev * commit '4dd839756ce032cb6db613f08b9a28e5cd20bbe9': Update DimLayer sizes on rotation.
| | * | | | | am d14fa78d: am 0af894d2: Merge "Update DimLayer sizes on rotation." into ↵Craig Mautner2014-02-134-43/+38
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit 'd14fa78dc84507fbdee8507205a3aff40296d328': Update DimLayer sizes on rotation.
| | | * | | | am 0af894d2: Merge "Update DimLayer sizes on rotation." into klp-modular-devCraig Mautner2014-02-134-43/+38
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | * commit '0af894d25133890e7765e6c582b3ac4829070de8': Update DimLayer sizes on rotation.
| | | | * | | Merge "Update DimLayer sizes on rotation." into klp-modular-devCraig Mautner2014-02-134-43/+38
| | | | |\ \ \
| | | | | * | | Update DimLayer sizes on rotation.Craig Mautner2014-02-134-43/+38
| | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Required replumbing and updating the TaskStack bounds calculations to match the new separation of TaskStack from DisplayContent. Fixes bug 12780687. Change-Id: I061c92831c06f4eb3e673ad6296e721b0c0f3202
* | | | | | | am 831663d8: Merge "reduce error logs from disconnected ↵Guang Zhu2014-02-131-1/+8
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AccessibilityNodeInfo\'s" * commit '831663d8fad6b31fb01b626dc2c15623690cbf37': reduce error logs from disconnected AccessibilityNodeInfo's
| * | | | | | Merge "reduce error logs from disconnected AccessibilityNodeInfo's"Guang Zhu2014-02-131-1/+8
| |\ \ \ \ \ \
| | * | | | | | reduce error logs from disconnected AccessibilityNodeInfo'sGuang Zhu2014-02-121-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ChromeView generates a large amount of such logs; while the real root cause is being fixed, reduce the verbosity so other interesting logs won't get overwritten. Bug: 10871032 Change-Id: If42116671062d7b2cc2a13384424575da499c493
* | | | | | | | am d39ccd0a: Merge "Start tracking radio up time."Dianne Hackborn2014-02-137-89/+179
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd39ccd0ad9cb562b0093eaf78a5273b000c0aa7a': Start tracking radio up time.
| * | | | | | | Merge "Start tracking radio up time."Dianne Hackborn2014-02-137-89/+179
| |\ \ \ \ \ \ \
| | * | | | | | | Start tracking radio up time.Dianne Hackborn2014-02-137-89/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now always turn on network state tracking for mobile, and push this information down to battery stats. In battery stats we use this to both log the changes in the history and keep track of the total time the mobile radio was active. Power computation is switched over to using this information to help determine power use, which will hopefully make it more accurate (not counting inaccuracies in knowing when it actually goes down). Note yet done is aggregating this data per-uid, to better emphasize which apps are causing the radio to be up. Right now we just spread the total time across all uids weighted by the total number of packets they have sent and received. Also put in the battery stats infrastructure for bluetooth to address issue #12973036: Improve power_profile.xml Change-Id: I39d11b7ff6ae4f336f253d1cba308d8569de7e0d
* | | | | | | | | am d430354c: Merge "Revert "Split AndroidRuntime into AndroidRuntimeBase ↵Andreas Huber2014-02-1312-139/+50
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | base-class and the rest."" * commit 'd430354c6b6b3b39c35e8af90007414c325ccb2d': Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."
| * | | | | | | | Merge "Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and ↵Andreas Huber2014-02-1312-139/+50
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the rest.""
| | * | | | | | | | Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."Andreas Huber2014-02-1312-139/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7825334929b098b36e1144872200e75ba6d24b13. Change-Id: I1702eb3ff9d7192d64039c8bf4bc3fc5d8e458c4
* | | | | | | | | | am 04f0cab7: Merge "Split AndroidRuntime into AndroidRuntimeBase base-class ↵Andreas Huber2014-02-1312-50/+139
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and the rest." * commit '04f0cab79d1499a5fe27330bb30dd94151b82880': Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.
| * | | | | | | | | Merge "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."Andreas Huber2014-02-1312-50/+139
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.Andreas Huber2014-02-1212-50/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AndroidRuntimeBase (exported by libandroid_runtime_base.so) is all you need to link against to gain the ability to do AndroidRuntimeBase::getJNIEnv() thus minimizing build dependencies. Change-Id: Ia7f0c94c8c02b974c068e0db34774827f96aa95b
* | | | | | | | | | Merge "Expose sendEnvelope." into master-novaDerek Tan2014-02-133-4/+46
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Expose sendEnvelope.Derek Tan2014-02-123-4/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I21565fae9ba8f163aed9104db355aecf9bae1796
* | | | | | | | | | | am f6475c72: Merge "Fix NPE in BaseStatusBar."John Spurlock2014-02-131-2/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f6475c7204759a57bc730e2bbaefb3448a77c141': Fix NPE in BaseStatusBar.
| * | | | | | | | | | Merge "Fix NPE in BaseStatusBar."John Spurlock2014-02-131-2/+3
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix NPE in BaseStatusBar.John Spurlock2014-02-131-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:12996414 Change-Id: Icded809ce14ca6fc5d11bee1c2470152d507cee2
* | | | | | | | | | | | am 00515148: resolved conflicts for merge of 396b9e79 to masterNarayan Kamath2014-02-1314-10/+1352
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '005151484546fb0bf7f83c5a6ee065715230bf26': Telephony API extension v2
| * | | | | | | | | | | resolved conflicts for merge of 396b9e79 to masterNarayan Kamath2014-02-1314-10/+1352
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | Change-Id: Ie71a79699be57f5af6069559068bf6253835d805
| | * | | | | | | | | | am 27bf55c8: am 16c0b295: am bba3a694: Merge "Telephony API extension v2"Wink Saville2014-02-1314-10/+1351
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '27bf55c8159e7f883ddc839453d5a12374ddc50a': Telephony API extension v2
| | | * | | | | | | | | am 16c0b295: am bba3a694: Merge "Telephony API extension v2"Wink Saville2014-02-1314-10/+1351
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '16c0b295ef069e128a4e01fd2f72da06784950a1': Telephony API extension v2
| | | | * \ \ \ \ \ \ \ \ am bba3a694: Merge "Telephony API extension v2"Wink Saville2014-02-1214-10/+1351
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bba3a694b8400fd340c0400bf42ef3d79a4285b1': Telephony API extension v2
| | | | | * \ \ \ \ \ \ \ \ Merge "Telephony API extension v2"Wink Saville2014-02-1314-10/+1351
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | Telephony API extension v2Antonio Marín Cerezuela2014-01-1014-10/+1351
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new AndroidManifest permission: android.permission.READ_PRECISE_PHONE_STATE Added the following PhoneStateListeners and corresponding broadcast intents: onPreciseCallStateChanged(PreciseCallState callState); onPreciseDataConnectionStateChanged(PreciseDataConnectionState dataConnectionState); broadcastPreciseCallStateChanged(int ringingCallState, int foregroundCallState, int backgroundCallState, int disconnectCause, int preciseDisconnectCause) broadcastPreciseDataConnectionStateChanged(int state, int networkType, String apnType, String apn, String reason, LinkProperties linkProperties, String failCause) Added TelephonyManager intent actions with their extras and constants: public static final String ACTION_PRECISE_CALL_STATE_CHANGED = "android.intent.action.PRECISE_CALL_STATE"; public static final String ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED = "android.intent.action.PRECISE_DATA_CONNECTION_STATE_CHANGED"; public static final int PRECISE_CALL_STATE_* Moved public static final int DISCONNECT_CAUSE_* from PreciseCallState.java to a new class DisconnectCause.java Moved public static final int PRECISE_DISCONNECT_CAUSE_* from PreciseCallState.java to a new class PreciseDisconnectCause.java Change-Id: If3b88c679507c529b746046c4a17cf6d9974bd09
* | | | | | | | | | | | | | | am 5da502a5: am b9378d81: am 321cd18a: am 820bb4bd: am 9c50271d: am ↵Dirk Dougherty2014-02-133-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 257f6724: am 35cb4e49: Doc change: add new samples TOC groups and landing pages. * commit '5da502a5b2a6eed6cf667c5d609818442a838c8a': Doc change: add new samples TOC groups and landing pages.
| * | | | | | | | | | | | | | am b9378d81: am 321cd18a: am 820bb4bd: am 9c50271d: am 257f6724: am ↵Dirk Dougherty2014-02-133-0/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35cb4e49: Doc change: add new samples TOC groups and landing pages. * commit 'b9378d8108555c920880d7ec7ec4122b04fb2960': Doc change: add new samples TOC groups and landing pages.
| | * | | | | | | | | | | | | am 321cd18a: am 820bb4bd: am 9c50271d: am 257f6724: am 35cb4e49: Doc change: ↵Dirk Dougherty2014-02-133-0/+24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add new samples TOC groups and landing pages. * commit '321cd18ab21966383d75ba1e9c09b0adf932383b': Doc change: add new samples TOC groups and landing pages.
| | | * | | | | | | | | | | | am 820bb4bd: am 9c50271d: am 257f6724: am 35cb4e49: Doc change: add new ↵Dirk Dougherty2014-02-133-0/+24
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | samples TOC groups and landing pages. * commit '820bb4bdd358bfaac446b8ce4af5474dcfc77613': Doc change: add new samples TOC groups and landing pages.
| | | | * | | | | | | | | | | am 9c50271d: am 257f6724: am 35cb4e49: Doc change: add new samples TOC ↵Dirk Dougherty2014-02-133-0/+24
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | groups and landing pages. * commit '9c50271dc34e48d527db7da85c3b3474574faee2': Doc change: add new samples TOC groups and landing pages.
| | | | | * \ \ \ \ \ \ \ \ \ \ am 257f6724: am 35cb4e49: Doc change: add new samples TOC groups and landing ↵Dirk Dougherty2014-02-133-0/+24
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pages. * commit '257f67249afb017c9a3d0a79e545da567aa5bd02': Doc change: add new samples TOC groups and landing pages.
| | | | | | * \ \ \ \ \ \ \ \ \ \ am 35cb4e49: Doc change: add new samples TOC groups and landing pages.Dirk Dougherty2014-02-133-0/+24
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '35cb4e49365a8a8da0607c2659399aaad9ea5a1c': Doc change: add new samples TOC groups and landing pages.
| | | | | | | * | | | | | | | | | | Doc change: add new samples TOC groups and landing pages.Dirk Dougherty2014-02-123-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2f39e82fb79d4f19362d9fe2deafdde5d87873a7
* | | | | | | | | | | | | | | | | | am 35fbb9f9: (-s ours) Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-02-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '35fbb9f9e59795e233fb59cb5a87573e4669aebd': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-02-137-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-02-09 03:59:36 +0000