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

47774 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
2499da83cb Merge "Mark a disable apn so we don't reconnect." into honeycomb-LTE 2011-05-06 14:52:45 -07:00
Robert Greenwalt
51a8610f9a Mark a disable apn so we don't reconnect. 
Strip out the pending-action stuff so things are more clear.
bug:4378382

Change-Id: I0e98559c88dccd50169c29d1e74421acb4246b78
 2011-05-06 13:23:06 -07:00
Scott Main
6c6b62e04d am 223a94d2: docs: de-new the dev guide toc 
* commit '223a94d2effd0ba9ef205d0bb790a5bdfb4d54c0':
  docs: de-new the dev guide toc
 2011-05-06 10:05:56 -07:00
Scott Main
223a94d2ef docs: de-new the dev guide toc 
Change-Id: I11ab2fcb8472876aa0776383490390d502475e39
 2011-05-06 09:53:29 -07:00
Scott Main
0d560d454b am 9f7054fe: Merge "docs: add package description for mtp and a little more info to MtpDevice" into honeycomb-mr1 
* commit '9f7054fea28e65ae1bf8bc1114090306979ba657':
  docs: add package description for mtp and a little more info to MtpDevice
 2011-05-06 08:41:57 -07:00
Scott Main
9f7054fea2 Merge "docs: add package description for mtp and a little more info to MtpDevice" into honeycomb-mr1 2011-05-06 08:31:40 -07:00
Scott Main
8ce58e5062 am f88b52fb: Merge "docs: version notes for tools 11" into honeycomb-mr1 
* commit 'f88b52fbf693d8b17e57a9d2fdda5a29e1bfa8d9':
  docs: version notes for tools 11
 2011-05-05 18:34:42 -07:00
Scott Main
f88b52fbf6 Merge "docs: version notes for tools 11" into honeycomb-mr1 2011-05-05 18:32:42 -07:00
Scott Main
19f72015c9 docs: version notes for tools 11 
Change-Id: Id33ba830b550d8d99b23f012501023b4675ba3eb
 2011-05-05 18:27:49 -07:00
Scott Main
a7a9c4cbbc am 46524f83: Merge "docs: add package description for RTP" into honeycomb-mr1 
* commit '46524f83a55731cd96c9df8a87be6dacb1db1a37':
  docs: add package description for RTP
 2011-05-05 18:00:57 -07:00
Scott Main
46524f83a5 Merge "docs: add package description for RTP" into honeycomb-mr1 2011-05-05 17:59:24 -07:00
Scott Main
7bf1c661f1 am 034d89d9: docs: cherrypick Change-Id: I3d871d494cf1f626df701efaa43058b66893259e docs: add info about customizing the density of an AVD from command line; and a few editorial things like fix the TOCs 
* commit '034d89d9a4b56014ea198bcdeaa5ad922608ae40':
  docs: cherrypick Change-Id: I3d871d494cf1f626df701efaa43058b66893259e docs: add info about customizing the density of an AVD from command line; and a few editorial things like fix the TOCs
 2011-05-05 17:53:57 -07:00
Scott Main
034d89d9a4 docs: cherrypick Change-Id: I3d871d494cf1f626df701efaa43058b66893259e 
docs: add info about customizing the density of an AVD from command line;
and a few editorial things like fix the TOCs

Change-Id: I4e301fe005d8fb4d04550b7db5afe2b63fe66802
 2011-05-05 17:47:40 -07:00
Scott Main
de9acb76d9 docs: add package description for RTP 
Change-Id: I02c181a48101be288fb4aabf497f573f00038f90
 2011-05-05 17:32:01 -07:00
Wink Saville
d237d05c6f Merge "Add Delay for data connection retry." into honeycomb-LTE 2011-05-05 16:20:11 -07:00
Wink Saville
8bc60413b9 Merge "DataConnection: Fix handling of PDP setup failure." into honeycomb-LTE 2011-05-05 16:20:02 -07:00
Bill Gruber
48f472f748 am 0369cf98: Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080 IAB docs: adds best practices for pending transaction UI 
* commit '0369cf98743e72d052eb5542125f58d1ad2f7f61':
  Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080 IAB docs: adds best practices for pending transaction UI
 2011-05-05 16:05:41 -07:00
Scott Main
0cdd9f7def docs: add package description for mtp and a little more info to MtpDevice 
Change-Id: I44b3926c4a286f624de525a7f0cc896879582bf5
 2011-05-05 15:53:44 -07:00
Bill Gruber
0369cf9874 Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080 
IAB docs: adds best practices for pending transaction UI

Change-Id: I9e27f3421e57b20c5b5961fc680fe89e3d5e865b
 2011-05-05 15:49:25 -07:00
Scott Main
4c8fa6d135 am 1c71fffe: update platform version number for docs 
* commit '1c71fffeb5d6a241ccbe7f035ce0d030eaeef562':
  update platform version number for docs
 2011-05-05 15:18:19 -07:00
Scott Main
1c71fffeb5 update platform version number for docs 
Change-Id: If0866ab1544ce0f5e70bbbe93d30ed27c4403406
 2011-05-05 14:49:47 -07:00
Teng-Hui Zhu
a8f6a0d90c DO NOT MERGE: Don't send pause again when coming back from full screen 
When we enter full screen, the inline video has been paused.
When we re-play in the inline mode, we don't need to paused the previous video,
which is the full screen one.

bug:4259109
Change-Id: I577edf43563116b0d1a9266d741e6a8aabbca779
 2011-05-05 14:34:26 -07:00
Ramesh Sudini
cf7db80a9a Add Delay for data connection retry. 
Change-Id: Id2c6db09827f29198e38fb9ade4141fab9fa29fc
 2011-05-05 14:18:48 -07:00
Ramesh Sudini
a29e094a98 DataConnection: Fix handling of PDP setup failure. 
Change-Id: Ib73c5aad1f9f07ddca7e2e0b3dfba6ed40aa47ef
 2011-05-05 14:05:19 -07:00
Scott Main
475917c7e4 am e6746acd: Merge "docs: update homepage to announce 3.1" into honeycomb-mr1 
* commit 'e6746acde2a0cc4faad9bdec026a9554797e2f94':
  docs: update homepage to announce 3.1
 2011-05-05 08:43:42 -07:00
Scott Main
e6746acde2 Merge "docs: update homepage to announce 3.1" into honeycomb-mr1 2011-05-05 08:33:03 -07:00
Wink Saville
676db0d301 Merge "Fix 4379712 NPE in GsmDataConnectionTracker" into honeycomb-LTE 2011-05-04 17:01:32 -07:00
Robert Ly
2246bc665d am 7157b7c3: Merge "doc change: a misplaced link removed" into honeycomb-mr1 
* commit '7157b7c31462e9340847d15d936bbb0b1117ecbb':
  doc change: a misplaced link removed
 2011-05-04 17:00:10 -07:00
Robert Ly
7157b7c314 Merge "doc change: a misplaced link removed" into honeycomb-mr1 2011-05-04 16:55:59 -07:00
Robert Greenwalt
aacd80fd87 Fix build break. 
Change-Id: Ic61448f468fb97a2ae032bf5782b33ed8972e20f
 2011-05-04 16:50:10 -07:00
Robert Ly
d834113247 doc change: a misplaced link removed 
Change-Id: If8b12e5409b44a095593b126a18fa6c0d572cc59
 2011-05-04 16:41:40 -07:00
Katie McCormick
7d51365238 am 62922c36: Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340 
* commit '62922c361e0c1b36c3787d7f06d04c3a609c2b12':
  Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340
 2011-05-04 15:47:10 -07:00
Katie McCormick
62922c361e Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340 
Change-Id: I9633f380f701bfa63453c9e969eeb0236a37894e
 2011-05-04 15:34:28 -07:00
Wink Saville
ed2989a9e1 Fix 4379712 NPE in GsmDataConnectionTracker 
Releasing the apnContext too soon and move getting the dc and dcac
into the ok path.

Bug: 4379712
Change-Id: I0296b65ec5842b0219269a73d48ac39086c382fd
 2011-05-04 15:16:12 -07:00
Scott Main
f9e9452c2d am ad3b87aa: cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions 
* commit 'ad3b87aa0d094c3e867ce44ec3f61e0b02090417':
  cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions
 2011-05-04 15:09:53 -07:00
Scott Main
ad3b87aa0d cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 
docs: update dashboard for platform versions

Change-Id: I21ddf27d0ad5bba817f6995ae716c6dc1029c0a5
 2011-05-04 15:03:38 -07:00
Scott Main
bb4ffd45c8 am 41703766: docs: typo in menu doc 
* commit '41703766815918c96fa0f45c6f27a29a0865846a':
  docs: typo in menu doc
 2011-05-04 14:41:35 -07:00
Scott Main
d566dc1906 am 7017c942: docs: fix issue 4383086 
* commit '7017c94249f7d27643fefd242e9faf9e53ce986e':
  docs: fix issue 4383086
 2011-05-04 14:37:10 -07:00
Scott Main
4170376681 docs: typo in menu doc 
Change-Id: Ic67cce880406a7daeb98d37312dd34c6a681a7af
 2011-05-04 14:36:56 -07:00
Scott Main
7017c94249 docs: fix issue 4383086 
Change-Id: I43fa88645b6b81102452d4a977ce5579275a2235
 2011-05-04 14:33:46 -07:00
Scott Main
8f5379b4d7 docs: update homepage to announce 3.1 
Change-Id: Ide4175f48b765484f0a1bbb5be3bc56e79e97612
 2011-05-04 13:38:05 -07:00
Robert Ly
7c8be3a75d am 762481f0: Merge "adding the usb apis to the resources browser" into honeycomb-mr1 
* commit '762481f0b58ac41b7583f74315fcb213ca0eb630':
  adding the usb apis to the resources browser
 2011-05-04 13:14:48 -07:00
Robert Ly
762481f0b5 Merge "adding the usb apis to the resources browser" into honeycomb-mr1 2011-05-04 13:10:54 -07:00
Robert Ly
f0a1d683d9 am fd7974f5: Merge "Doc change: adding usb docs and removed ADK doc. ADK doc will be in another CL" into honeycomb-mr1 
* commit 'fd7974f531b8784e7d229d31dda228cca0e7c2d8':
  Doc change: adding usb docs and removed ADK doc. ADK doc will be in another CL
 2011-05-04 12:27:39 -07:00
Robert Ly
fd7974f531 Merge "Doc change: adding usb docs and removed ADK doc. ADK doc will be in another CL" into honeycomb-mr1 2011-05-04 12:18:09 -07:00
Robert Greenwalt
f13eb8301f Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE 2011-05-04 09:59:30 -07:00
Mike Lockwood
36132a488b DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath() 
This will prevent MediaProvider from adding these files to the images table

Change-Id: Ice4756b64a067f3aceff08ab2c5e91665109dde5
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-04 10:41:21 -04:00
Mike Lockwood
8b1c74f96f DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic 
Don't let the "no media" status of one directory leak to the remaining files
and directories in the same parent.

Bug: 4364077

Change-Id: I2b04b872ece69441387c7fa579441a53f6f358d3
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-04 10:41:21 -04:00
Mike Lockwood
a792c80402 DO NOT MERGE MTP: Implement GetThumb command 
This allows the PC to access thumbnails in JPEG files over MTP/PTP

Bug: 3219495

Change-Id: I565be1fb84e8a204f2be11342b5b952e8965afdf
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-04 10:41:21 -04:00
Mike Lockwood
af50821bac DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions 
Change-Id: Ied2b60e4af5606cb405d048f416e8a7eb3c4d5b8
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-04 10:41:20 -04:00