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
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
Elliott Hughes
c63c068228 am e3b94f05: Merge "Track libcore API change." 
* commit 'e3b94f05b8be2b6305cbee77c23b7f7599bfcff7':
  Track libcore API change.
 2013-06-28 18:11:10 -07:00
Elliott Hughes
e3b94f05b8 Merge "Track libcore API change." 2013-06-29 01:08:25 +00:00
Elliott Hughes
97c538d5f3 Track libcore API change. 
Bug: 3484927
Change-Id: If49d0389e4ecb826052e168e070b673894d91318
 2013-06-28 18:03:46 -07:00
Elliott Hughes
b8292830f7 resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp 
Change-Id: I3349f8d2e6715171e2677c1385122ceb2810c1f6
 2013-06-28 16:50:13 -07:00
Elliott Hughes
a920f25fe5 resolved conflicts for merge of fca0f92e to stage-aosp-master 
Change-Id: I4791f0ffa324a313b8390fbde6d8f82f716ecf74
 2013-06-28 16:41:19 -07:00
Elliott Hughes
fca0f92e0a Merge "Switch frameworks/base over from @hidden Charsets to public StandardCharsets." 2013-06-28 23:31:35 +00:00
Elliott Hughes
d1411efee3 am 324993ab: am 5216f11e: Merge "Track libcore API update." 
* commit '324993abed48843da1cb63063668147151e4db5c':
  Track libcore API update.
 2013-06-28 16:26:08 -07:00
Elliott Hughes
d396a448b2 Switch frameworks/base over from @hidden Charsets to public StandardCharsets. 
Bug: 3484927
Change-Id: I5d136d2ee629588538602766a182ae14ce5fc63c
 2013-06-28 16:24:48 -07:00
Elliott Hughes
324993abed am 5216f11e: Merge "Track libcore API update." 
* commit '5216f11e462b9f17704c0ac9e193d2149f3fa755':
  Track libcore API update.
 2013-06-28 16:23:47 -07:00
Elliott Hughes
5216f11e46 Merge "Track libcore API update." 2013-06-28 23:17:20 +00:00
Elliott Hughes
0e88a95480 Track libcore API update. 
Bug: 3484927
Change-Id: I77c22d3da7b70d3dae4cf6c1903add948ae39406
 2013-06-28 16:08:02 -07:00
Elliott Hughes
5d2d22221a am ce566b50: am ee66531f: Merge "Track libcore API update." 
* commit 'ce566b5068bb73b7e379bb40c3eb74922000bbd9':
  Track libcore API update.
 2013-06-28 16:01:51 -07:00
Elliott Hughes
ce566b5068 am ee66531f: Merge "Track libcore API update." 
* commit 'ee66531f2fa2b6aaa5ca064062f5e8d50b64ff44':
  Track libcore API update.
 2013-06-28 15:58:45 -07:00
Elliott Hughes
ee66531f2f Merge "Track libcore API update." 2013-06-28 22:56:03 +00:00
Elliott Hughes
6859af17ce Track libcore API update. 
Bug: 3484927
Change-Id: I684d724000d09a52c840076fab5985242c77c908
 2013-06-28 15:28:00 -07:00
Romain Guy
d971caa5d5 Fix out of range glCopyTexImage2D 
Bug #9425270

A better solution would be to use glCopyTexImage2D whenever possible but
this change would be a little more dangerous.

Change-Id: Ib1aaceda39d838716285ef97f356721416822dbb
 2013-06-28 14:37:24 -07:00
Amith Yamasani
937db2d48f When a new user AID is generated, dump it to dropbox 
Bug: 9595851
Change-Id: I6fde757eed84d7914db180e80c9d68448b3e5780
 2013-06-28 14:37:13 -07:00
Romain Guy
f63fdf8680 Recreate TextureView's display list on attach 
Bug #9425270

When a TextureView is detached from its window and immediately
re-attached, the display list is not destroyed but reused as is.
TextureView will however destroy the layer and surface texture
reference by the display list.

The solution is to force TextureView to invalidate its display
list on re-attach if it previously had a surface/layer pair.

Change-Id: I475096ffa7e5709155c4c943bf1bfaaaedbd4a1d
 2013-06-28 14:36:58 -07:00
Robert Greenwalt
46bb6d6cb7 Fix power issues around wifi scans. 
- Sending a broadcast indicating when scan requests could be serviced so that
apps don't request scans we won't do anything with.
- Fix our batt stats accounting so we only count it if we send the request to
the driver.

bug: 8868201
bug: 9496690
Change-Id: I64a4f1c294c848ac64c50d8854ed4a6a1a47f603
 2013-06-28 14:36:40 -07:00