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

108712 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
e323299498 Import translations. DO NOT MERGE 
Change-Id: Ief9384906e7c86d91998bc55d74107d9ade5e6c1
Auto-generated-cl: translation import
 2013-07-03 11:52:42 -07:00
The Android Open Source Project
5fd05c34b0 am 48de2c72: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 
* commit '48de2c723dfecabc40a86fe70c6ea4821884e8b3':
  Expose latency methods through AudioManager and AudioTrack.
  Fix  NPE if mobile is not supported in checkMobileProvisioning.
  Temporarily disable 'Scan Always' mode
 2013-07-03 08:53:48 -07:00
The Android Open Source Project
48de2c723d Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 
Change-Id: I343bd8f6d948c90cd5cede9dc160c86ebce6501c
 2013-07-03 08:51:11 -07:00
Vinit Deshpande
2120bbb2c7 am 6ea2faf8: am 64036633: am c2656a98: Merge "Revert "Temporarily disable \'Scan Always\' mode"" into jb-mr2-dev 
* commit '6ea2faf8ca7e1d7f75e41c9b13d36fa47436e1cc':
  Revert "Temporarily disable 'Scan Always' mode"
 2013-07-03 08:32:32 -07:00
quddusc
c2dba2be4b am e48269f8: am 5a165342: am 2a6cbf29: Merge "docs: Updated uiautomator developer guide documentation for JB MR2 release. Bug: 8224013,8223957,8223641,8223589,8223815,7738720,7538348" into jb-mr2-dev 
* commit 'e48269f80a36900c37ed584a4bcb26af8494018b':
  docs: Updated uiautomator developer guide documentation for JB MR2 release. Bug: 8224013,8223957,8223641,8223589,8223815,7738720,7538348
 2013-07-03 08:32:28 -07:00
Vinit Deshpande
6ea2faf8ca am 64036633: am c2656a98: Merge "Revert "Temporarily disable \'Scan Always\' mode"" into jb-mr2-dev 
* commit '6403663343e6ef1962f0f5e1490d975cbcc653a2':
  Revert "Temporarily disable 'Scan Always' mode"
 2013-07-03 08:16:40 -07:00
quddusc
e48269f80a am 5a165342: am 2a6cbf29: Merge "docs: Updated uiautomator developer guide documentation for JB MR2 release. Bug: 8224013,8223957,8223641,8223589,8223815,7738720,7538348" into jb-mr2-dev 
* commit '5a1653425a5b445bd716329c2b119e14bf30aacd':
  docs: Updated uiautomator developer guide documentation for JB MR2 release. Bug: 8224013,8223957,8223641,8223589,8223815,7738720,7538348
 2013-07-03 08:16:36 -07:00
Vinit Deshpande
6403663343 am c2656a98: Merge "Revert "Temporarily disable \'Scan Always\' mode"" into jb-mr2-dev 
* commit 'c2656a98cebab37454c9205b3f4a4ab6afb511a2':
  Revert "Temporarily disable 'Scan Always' mode"
 2013-07-03 06:44:20 -07:00
quddusc
5a1653425a am 2a6cbf29: Merge "docs: Updated uiautomator developer guide documentation for JB MR2 release. Bug: 8224013,8223957,8223641,8223589,8223815,7738720,7538348" into jb-mr2-dev 
* commit '2a6cbf292fbe9b0ddbee2c867617478a6a1cccc1':
  docs: Updated uiautomator developer guide documentation for JB MR2 release. Bug: 8224013,8223957,8223641,8223589,8223815,7738720,7538348
 2013-07-03 06:43:56 -07:00
Oliver Woodman
58101e218c Expose latency methods through AudioManager and AudioTrack. 
There's a longer term plan to fix audio/video sync, but
this gets the Java level to parity with the native level,
and allows applications in Java to achieve sync in the
same way as the native media player. APIs are left as hidden
for now.

Bug: 9587132
Change-Id: Iaf70baac1ffb50ef48e03355163158568fbd0fe9
 2013-07-02 19:34:13 -07:00
Vinit Deshpande
c2656a98ce Merge "Revert "Temporarily disable 'Scan Always' mode"" into jb-mr2-dev 2013-07-03 00:12:53 +00:00
Vinit Deshpande
218339818c Revert "Temporarily disable 'Scan Always' mode" 
This reverts commit c16b0d0061108685e74b40d77ad801fe0304bc42.

Change-Id: I89a23f5d786a53eea97fef3f19bd15f97fc26157
 2013-07-03 00:10:53 +00:00
Christopher Tate
d04f864ad2 Merge "Add dumpsys of recent wakeup patterns, for analysis" 2013-07-02 22:21:59 +00:00
Christopher Tate
18a75f1123 Add dumpsys of recent wakeup patterns, for analysis 
Keeps one day of alarm history, and for each one puts a line in dumpsys:
RTC timestamp, millis since previous wakeup alarm, uid, and intent action

Bug 9532215

Change-Id: Ib4fb41aa6291a4cf8f3301bfebf7974e99a9d52c
 2013-07-02 15:14:41 -07:00
Jean-Baptiste Queru
f5d6e24736 am 51ec7f37: am da52b9a2: am 8113b17c: Merge "Fixed incorrect calculation of dirty invalidation area" 
* commit '51ec7f3725877a45b518299f279a68e6f5ea8e59':
  Fixed incorrect calculation of dirty invalidation area
 2013-07-02 15:02:17 -07:00
quddusc
2a6cbf292f Merge "docs: Updated uiautomator developer guide documentation for JB MR2 release. Bug: 8224013,8223957,8223641,8223589,8223815,7738720,7538348" into jb-mr2-dev 2013-07-02 22:00:38 +00:00
Jean-Baptiste Queru
51ec7f3725 am da52b9a2: am 8113b17c: Merge "Fixed incorrect calculation of dirty invalidation area" 
* commit 'da52b9a28756e67daa03654953678dfa08e0ca5d':
  Fixed incorrect calculation of dirty invalidation area
 2013-07-02 15:00:01 -07:00
Jean-Baptiste Queru
da52b9a287 am 8113b17c: Merge "Fixed incorrect calculation of dirty invalidation area" 
* commit '8113b17c473367bd1be7db707fc5b94121cb09e5':
  Fixed incorrect calculation of dirty invalidation area
 2013-07-02 14:58:22 -07:00
Jean-Baptiste Queru
8113b17c47 Merge "Fixed incorrect calculation of dirty invalidation area" 2013-07-02 21:56:10 +00:00
quddusc
23f004f4c5 docs: Updated uiautomator developer guide documentation for JB MR2 release. 
Bug: 8224013,8223957,8223641,8223589,8223815,7738720,7538348

Change-Id: Id81ef4eec7c83ef8bfb8168e82fccc9d002fda99
 2013-07-02 14:25:49 -07:00
Wink Saville
e969964c80 am c880ae16: am db011499: am 753d754c: Merge "Fix NPE if mobile is not supported in checkMobileProvisioning." into jb-mr2-dev 
* commit 'c880ae16528aa90853952397b8e4d4a299d29c28':
  Fix  NPE if mobile is not supported in checkMobileProvisioning.
 2013-07-02 12:41:31 -07:00
Baligh Uddin
53c8979f10 am 2c975eda: (-s ours) am 24a12f67: am 697184b5: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '2c975eda80983d4222770284433b44fae75a7f7c':
  Import translations. DO NOT MERGE
 2013-07-02 12:41:28 -07:00
Wink Saville
c880ae1652 am db011499: am 753d754c: Merge "Fix NPE if mobile is not supported in checkMobileProvisioning." into jb-mr2-dev 
* commit 'db011499c80f663b30564f1978f3e8e56d60f6c6':
  Fix  NPE if mobile is not supported in checkMobileProvisioning.
 2013-07-02 12:36:47 -07:00
Baligh Uddin
2c975eda80 am 24a12f67: am 697184b5: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '24a12f67ba534bf158ee85cc998c2afbdfc7948a':
  Import translations. DO NOT MERGE
 2013-07-02 12:36:43 -07:00
Kenny Root
347403680e Merge "KeySetManager: iterate over correct list" 2013-07-02 19:32:45 +00:00
Wink Saville
db011499c8 am 753d754c: Merge "Fix NPE if mobile is not supported in checkMobileProvisioning." into jb-mr2-dev 
* commit '753d754c7dbd93a56cd671ee865f2e37ec3d3187':
  Fix  NPE if mobile is not supported in checkMobileProvisioning.
 2013-07-02 12:31:15 -07:00
Baligh Uddin
24a12f67ba am 697184b5: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '697184b56f918799440bf7749ea8c1e636a63725':
  Import translations. DO NOT MERGE
 2013-07-02 12:31:12 -07:00
Wink Saville
18a46a26a0 Fix NPE if mobile is not supported in checkMobileProvisioning. 
Bug: 9664438
Change-Id: If0c4938956a80e8d6a21a968aa771d0d8f546b3c
 2013-07-02 11:57:47 -07:00
Kenny Root
92179bc261 KeySetManager: iterate over correct list 
Change-Id: I43e18e824e62b3ec54964ace1485a45616b962f2
 2013-07-02 11:55:45 -07:00
Dianne Hackborn
d9fb14a38a Merge "Misc memory stuff." 2013-07-02 18:30:43 +00:00
Dianne Hackborn
2286cdc0ca Misc memory stuff. 
- New Activity.reportFullyDrawn() method that applicatins can call
  when they know they are fully drawn, allowing us to have better
  app launch time info.  This data is also included in usage stats.
- Added total and free memory data "dumpsys meminfo".
- Tuned the moderate memory levels to be more aggressive about
  considering the device getting low on RAM, and thus starting
  to prune RAM from processes.
- Fixed issues in processstats when reading old data as well as
  resetting and other various fixes.

Change-Id: I20efe7451afb4edfa1aeec448328ba601c24d869
 2013-07-02 11:21:04 -07:00
Wink Saville
753d754c7d Merge "Fix NPE if mobile is not supported in checkMobileProvisioning." into jb-mr2-dev 2013-07-02 18:17:00 +00:00
Wink Saville
68e6c6452c Fix NPE if mobile is not supported in checkMobileProvisioning. 
Bug: 9664438
Change-Id: If0c4938956a80e8d6a21a968aa771d0d8f546b3c
 2013-07-02 10:55:14 -07:00
Baligh Uddin
697184b56f Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-07-02 15:59:41 +00:00
Oliver Woodman
3fa263c6bd resolved conflicts for merge of dae9aa3f to master 
Change-Id: I6e1bb2f245042955a5cffcabddc1f33eafdadc8a
 2013-07-02 15:52:03 +01:00
The Android Automerger
cfa556303d merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-02 05:55:24 -07:00
Oliver Woodman
dae9aa3f37 am 9ad7b946: am 0661dd15: Merge "Expose latency methods through AudioManager and AudioTrack." into jb-mr2-dev 
* commit '9ad7b946fe9a5dd706205e90046ddc1bd6cb8ad0':
  Expose latency methods through AudioManager and AudioTrack.
 2013-07-02 01:33:56 -07:00
Oliver Woodman
9ad7b946fe am 0661dd15: Merge "Expose latency methods through AudioManager and AudioTrack." into jb-mr2-dev 
* commit '0661dd157f25e3cf8e89dbfe5d871e77e8e3738f':
  Expose latency methods through AudioManager and AudioTrack.
 2013-07-02 01:31:24 -07:00
Oliver Woodman
0661dd157f Merge "Expose latency methods through AudioManager and AudioTrack." into jb-mr2-dev 2013-07-02 08:11:14 +00:00
Baligh Uddin
7f48bea96b Merge "Import translations. DO NOT MERGE" 2013-07-02 05:37:13 +00:00
Satoshi Kataoka
1ae9e846f3 Merge "Fix possible NPE in IInputMethodWrapper" 2013-07-02 05:35:10 +00:00
Baligh Uddin
d34c92a61b am 14bca947: (-s ours) am cdf5ecc8: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev 
* commit '14bca94708363f3a22d741aad9e63132e903397e':
  Import translations. DO NOT MERGE
 2013-07-01 20:57:19 -07:00
Baligh Uddin
14bca94708 am cdf5ecc8: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev 
* commit 'cdf5ecc8c5fb754406206a78417c5a3b34c485b3':
  Import translations. DO NOT MERGE
 2013-07-01 20:55:14 -07:00
Baligh Uddin
cdf5ecc8c5 Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev 2013-07-02 03:53:08 +00:00
Baligh Uddin
87a345e993 am 22b41b0c: (-s ours) am 178807d5: am d6696b7c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '22b41b0c0909c89031d165f7bed3d2016f930033':
  Import translations. DO NOT MERGE
 2013-07-01 20:35:20 -07:00
Baligh Uddin
22b41b0c09 am 178807d5: am d6696b7c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '178807d590c1c873bd5eaae4c1cf331549fb6bbf':
  Import translations. DO NOT MERGE
 2013-07-01 20:32:18 -07:00
Jeff Sharkey
05373e9daf Merge "Support sorting in storage UI." 2013-07-02 03:30:51 +00:00
Baligh Uddin
178807d590 am d6696b7c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'd6696b7c0b8fdde1cbc9ed5db03126fccef9bb7f':
  Import translations. DO NOT MERGE
 2013-07-01 20:30:14 -07:00
Baligh Uddin
d6696b7c0b Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-07-02 03:28:52 +00:00
Jeff Sharkey
1482789374 Support sorting in storage UI. 
Extract mode information into DisplayState which is now consistent
across directory traversal.  Use grid mode by default when working
with images.  Dialog to switch sort order.

Add testing UI to exercise until we have real clients.

Change-Id: Ic423584d4559732fb3d2aea9e0406b57d43f6e6d
 2013-07-01 20:28:20 -07:00