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

106215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Malin
61754145f4 am 07797c45: am 5c27ec22: am c7d3d28b: am 8b3c7d0c: am c355a1c1: DOC: Sync Adapters Android Training 
* commit '07797c45dea5bcdf4c21ee7a30e02af98a2d8ed8':
  DOC: Sync Adapters Android Training
 2013-07-08 10:27:25 -07:00
Joe Malin
07797c45de am 5c27ec22: am c7d3d28b: am 8b3c7d0c: am c355a1c1: DOC: Sync Adapters Android Training 
* commit '5c27ec22133cbea536283c971857759e9e7188ba':
  DOC: Sync Adapters Android Training
 2013-07-08 10:24:48 -07:00
Joe Malin
5c27ec2213 am c7d3d28b: am 8b3c7d0c: am c355a1c1: DOC: Sync Adapters Android Training 
* commit 'c7d3d28b67ee038e6cb2b7a7ad80ea4a8fd3acdd':
  DOC: Sync Adapters Android Training
 2013-07-08 10:22:00 -07:00
Joe Malin
c7d3d28b67 am 8b3c7d0c: am c355a1c1: DOC: Sync Adapters Android Training 
* commit '8b3c7d0c8fec82a6ad32abcb7e78416d8513512d':
  DOC: Sync Adapters Android Training
 2013-07-08 10:19:25 -07:00
Joe Malin
8b3c7d0c8f am c355a1c1: DOC: Sync Adapters Android Training 
* commit 'c355a1c156ef549f97e3dc6611ab2a9c484889c5':
  DOC: Sync Adapters Android Training
 2013-07-08 10:17:08 -07:00
Elliott Hughes
269d372276 am 86aa1953: am 2a26547f: Merge "Track libcore API update." 
* commit '86aa19532896dc6ede04d53ee96708becde9b0dc':
  Track libcore API update.
 2013-07-08 10:03:48 -07:00
Elliott Hughes
86aa195328 am 2a26547f: Merge "Track libcore API update." 
* commit '2a26547fd391c8038ad9f57fcb51d62fba0ee543':
  Track libcore API update.
 2013-07-08 10:01:17 -07:00
Elliott Hughes
2a26547fd3 Merge "Track libcore API update." 2013-07-08 16:58:47 +00:00
Elliott Hughes
2ecdbc5395 Track libcore API update. 
Bug: 3484927
Change-Id: Icd8a45d33efd205a5eb21ac6a4fcf781f8b5e064
 2013-07-08 09:41:06 -07:00
The Android Automerger
e8fd900070 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-08 05:55:31 -07:00
Ken Wakasa
02a44f7d47 Revert "Stop marking gamepads as keyboards" 
This reverts commit 74c8fb601ef75d8e12df5221489c41c125e3b846.

Change-Id: If8ca4d09b4d52f11d48dabebf2dff2984760cdc0
bug: 8896129
 2013-07-05 04:08:36 +00:00
msg555
b264f5f83f Mixed delete/delete[]. 
Error found via valgrind.
 2013-07-03 19:26:23 -04:00
Baligh Uddin
2b6c25b7d5 am 8b152937: am be432a69: Import translations. DO NOT MERGE 
* commit '8b1529375c3cc410f766ec31571a6508be90f3a8':
  Import translations. DO NOT MERGE
 2013-07-03 11:38:46 -07:00
Baligh Uddin
8b1529375c am be432a69: Import translations. DO NOT MERGE 
* commit 'be432a6983ec479efb211a441e97ce48178b6ebc':
  Import translations. DO NOT MERGE
 2013-07-03 11:35:16 -07:00
Baligh Uddin
440df1bbb9 am 505565c3: Import translations. DO NOT MERGE 
* commit '505565c3481b59b2856c9b5c42ae19f54fdfcfb1':
  Import translations. DO NOT MERGE
 2013-07-03 11:35:02 -07:00
Baligh Uddin
505565c348 Import translations. DO NOT MERGE 
Change-Id: I5e1ae1aaa21b272c4731ec6f6f8d70a3c909a35a
Auto-generated-cl: translation import
 2013-07-03 11:22:24 -07:00
Baligh Uddin
be432a6983 Import translations. DO NOT MERGE 
Change-Id: I3e7dc51b5b326c7269cdb31a02642511d6dbf52b
Auto-generated-cl: translation import
 2013-07-03 11:20:22 -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
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
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
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
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
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
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
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
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
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
Vinit Deshapnde
fa62202efb Temporarily disable 'Scan Always' mode 
This change disables 'Scan Always' by ignoring the setting; and
hard coding value to 'false'. The UI will change based on whatever
is in settings; but underneath we won't enable scans when WiFi is
off.

Change-Id: Ibb1401207b6675e609e979ea23b63177814f762c
 2013-07-01 18:05:22 -07:00
Vinit Deshapnde
892b52f151 am 9f250e28: am 93647e2f: Merge "Temporarily disable \'Scan Always\' mode" into jb-mr2-dev 
* commit '9f250e28c39abfb14a80c1997a1915b97940e070':
  Temporarily disable 'Scan Always' mode
 2013-07-01 17:58:40 -07:00
Vinit Deshapnde
9f250e28c3 am 93647e2f: Merge "Temporarily disable \'Scan Always\' mode" into jb-mr2-dev 
* commit '93647e2f8f0c1b52d6b8f017096f4f037f9733b9':
  Temporarily disable 'Scan Always' mode
 2013-07-01 17:56:30 -07:00