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

106234 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Vinit Deshapnde
93647e2f8f Merge "Temporarily disable 'Scan Always' mode" into jb-mr2-dev 2013-07-02 00:54:19 +00:00
Vinit Deshapnde
c16b0d0061 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 17:10:28 -07:00
Elliott Hughes
9544df0767 am e88fe7f4: am 94fed1c5: Merge "Track libcore API update." 
* commit 'e88fe7f415334ae04a289f8bc697404212784df0':
  Track libcore API update.
 2013-07-01 16:48:00 -07:00
Elliott Hughes
e88fe7f415 am 94fed1c5: Merge "Track libcore API update." 
* commit '94fed1c5d570a92d357657451e5b47aba4feee12':
  Track libcore API update.
 2013-07-01 16:45:33 -07:00
Elliott Hughes
94fed1c5d5 Merge "Track libcore API update." 2013-07-01 23:40:18 +00:00
Elliott Hughes
bf1589d0df Track libcore API update. 
Bug: 3484927
Change-Id: I04de17b1191295e3fa874c9e351ae686d9eecef5
 2013-07-01 16:39:34 -07:00
Elliott Hughes
aaf1612067 am 7c56325d: am c26e5505: Merge "Track libcore API update." 
* commit '7c56325d57c3c6022cfcb9b71343751c572bc656':
  Track libcore API update.
 2013-07-01 16:24:48 -07:00
Elliott Hughes
7c56325d57 am c26e5505: Merge "Track libcore API update." 
* commit 'c26e5505495f7a36163477e12098d5fd2822cae9':
  Track libcore API update.
 2013-07-01 16:22:16 -07:00
Elliott Hughes
c26e550549 Merge "Track libcore API update." 2013-07-01 23:20:09 +00:00
Wink Saville
e2be065142 am f313da5b: am aff0ac4d: Merge "Do not set the network mode differently for LTE+CDMA" 
* commit 'f313da5bfe1953fef509ba6bab7f654516a71509':
  Do not set the network mode differently for LTE+CDMA
 2013-07-01 16:03:38 -07:00
Wink Saville
f313da5bfe am aff0ac4d: Merge "Do not set the network mode differently for LTE+CDMA" 
* commit 'aff0ac4d202934dde7765f7418ea2ad38b0c2faa':
  Do not set the network mode differently for LTE+CDMA
 2013-07-01 16:00:23 -07:00
Wink Saville
aff0ac4d20 Merge "Do not set the network mode differently for LTE+CDMA" 2013-07-01 22:56:08 +00:00
Wink Saville
3b5d686e68 am c45f2e05: am 59046f40: Merge "Add checkMobileProvisioning to ConnectivityService." into jb-mr2-dev 
* commit 'c45f2e05e3b9d261009c66346ef2257ec105f05c':
  Add checkMobileProvisioning to ConnectivityService.
 2013-07-01 15:41:31 -07:00
Wink Saville
c45f2e05e3 am 59046f40: Merge "Add checkMobileProvisioning to ConnectivityService." into jb-mr2-dev 
* commit '59046f40baa66d3f10761d8294a43f92feef5c2e':
  Add checkMobileProvisioning to ConnectivityService.
 2013-07-01 15:39:00 -07:00
Wink Saville
59046f40ba Merge "Add checkMobileProvisioning to ConnectivityService." into jb-mr2-dev 2013-07-01 22:36:48 +00:00
Elliott Hughes
812990a9e5 Track libcore API update. 
Bug: 3484927
Change-Id: I52a37bdeafe431255034543e0fad5f808955309f
 2013-07-01 14:46:31 -07:00
Oliver Woodman
e64716ad01 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-01 22:30:18 +01:00
Naveen Kalla
97ecc9ec24 Do not set the network mode differently for LTE+CDMA 
ro.telephony.default_network can be set if needed to set a different
value for LTE+CDMA. No need to hardcode preferred network mode in the source code.

Change-Id: Iae65f72a6a3bc31d500c5ecec87368a6f2a5d117
 2013-07-01 11:16:38 -07:00
The Android Open Source Project
60c2772ca7 Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 
Change-Id: I03f18d4939d298225e8954dfff6dc9cdbe71b8c7
 2013-07-01 07:42:58 -07:00
Baligh Uddin
453df32b1b Import translations. DO NOT MERGE 
Change-Id: I3ac72382fe871e8259decec6f202119bf9519972
Auto-generated-cl: translation import
 2013-07-01 07:35:00 -07:00
Baligh Uddin
daf1ad0ed8 Import translations. DO NOT MERGE 
Change-Id: I481fb8045084270cfb286b38f46abfdec5c9cd90
Auto-generated-cl: translation import
 2013-07-01 07:14:33 -07:00
Baligh Uddin
7dfba282d0 Import translations. DO NOT MERGE 
Change-Id: I64e7aab52eb9fe13b709d0243d1275b381f3301e
Auto-generated-cl: translation import
 2013-07-01 07:12:53 -07:00
The Android Automerger
84791f01f5 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-01 05:55:32 -07:00
Johan Viktorsson
e9018f7716 Fixed incorrect calculation of dirty invalidation area 
Padding was already taken into consideration before calling
invalidateDrawable in ProgressBar.

Change-Id: Id7f23bd15bb19e2294c07adb2acb397100ea97e8
 2013-07-01 13:43:19 +09:00
Joe Malin
653efe738e am 6635e269: am e9df511e: DOC: Sync Adapters Android Training 
* commit '6635e26991e27d8cf28a04e9aff381511492b113':
  DOC: Sync Adapters Android Training
 2013-06-30 09:20:56 -07:00
Joe Malin
6635e26991 am e9df511e: DOC: Sync Adapters Android Training 
* commit 'e9df511e2018eb6a296408d09e355c6f2c77ae59':
  DOC: Sync Adapters Android Training
 2013-06-30 09:17:51 -07:00
Joe Malin
c355a1c156 DOC: Sync Adapters Android Training 
Change-Id: Ia857483e1e530436d3c0b1c99697bd52eaa37903
(cherry picked from commit e9df511e2018eb6a296408d09e355c6f2c77ae59)
 2013-06-30 16:16:18 +00:00
The Android Automerger
4c97ad0fc5 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-30 05:55:29 -07:00
Joe Malin
e9df511e20 DOC: Sync Adapters Android Training 
Change-Id: Ia857483e1e530436d3c0b1c99697bd52eaa37903
 2013-06-29 21:46:59 -07:00
Wink Saville
ab9321d13d Add checkMobileProvisioning to ConnectivityService. 
Bug: 9279964
Change-Id: I42c326a21e05aa301e9d974ed9ac1d59472780ec
 2013-06-29 21:10:57 -07:00
Elliott Hughes
1a6fe26d1b am c63c0682: am e3b94f05: Merge "Track libcore API change." 
* commit 'c63c068228267b41fb106e22a6914ab19da9e5bc':
  Track libcore API change.
 2013-06-28 18:13:29 -07:00