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

52759 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
02f4e4f981 am 5d47d203: am fbef26eb: Merge "Enforce provision check for CSIM record only." into honeycomb-LTE 
* commit '5d47d203fb60f4e7c91d97fa852a23863861b011':
  Enforce provision check for CSIM record only.
 2011-06-14 15:22:42 -07:00
Wink Saville
35831f198a am aad3c3cb: am c2d17d3b: Merge "Make APN re-connect delay configuable" into honeycomb-LTE 
* commit 'aad3c3cbb8d6ceebcf99b80b1567f310b3216d6a':
  Make APN re-connect delay configuable
 2011-06-14 15:22:38 -07:00
Wink Saville
3bcc33fdec am 46cd4a4b: am 82c1a5de: Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE 
* commit '46cd4a4bfe432ed6b483c0d6fc1045e387f22710':
  Revert "CDMALTE: Get roaming status based on SID/NID"
 2011-06-14 15:22:33 -07:00
Mathias Agopian
ba7336b4f5 am 9ee39758: (-s ours) am a9007fbd: am 69b4587b: DO NOT MERGE. may fix build on some version of gcc 
* commit '9ee3975883cc4356d7b44f4e86d8c61589d2f42c':
  DO NOT MERGE. may fix build on some version of gcc
 2011-06-14 15:22:12 -07:00
Dianne Hackborn
386f67a152 am 8a73d211: am 74c48f2b: am 700a1f25: Merge "Update resources documentation with new qualifiers." into honeycomb-mr2 
* commit '8a73d211845671880b0d50fbb0c5caa065066c80':
  Update resources documentation with new qualifiers.
 2011-06-14 15:21:18 -07:00
Dianne Hackborn
65efcc5521 Merge "resolved conflicts for merge of 77fc8b80 to master" 2011-06-14 15:05:46 -07:00
Wink Saville
5d47d203fb am fbef26eb: Merge "Enforce provision check for CSIM record only." into honeycomb-LTE 
* commit 'fbef26eb55cf8a5b5a25a2b748bf16b54d398abc':
  Enforce provision check for CSIM record only.
 2011-06-14 14:48:51 -07:00
Wink Saville
aad3c3cbb8 am c2d17d3b: Merge "Make APN re-connect delay configuable" into honeycomb-LTE 
* commit 'c2d17d3bea02991df378237ea7058ccedb7c6a14':
  Make APN re-connect delay configuable
 2011-06-14 14:47:07 -07:00
Wink Saville
46cd4a4bfe am 82c1a5de: Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE 
* commit '82c1a5dea305d56eb77efa7d9a730307ff6af28a':
  Revert "CDMALTE: Get roaming status based on SID/NID"
 2011-06-14 14:47:04 -07:00
Wink Saville
fbef26eb55 Merge "Enforce provision check for CSIM record only." into honeycomb-LTE 2011-06-14 14:44:31 -07:00
Wink Saville
c2d17d3bea Merge "Make APN re-connect delay configuable" into honeycomb-LTE 2011-06-14 14:44:23 -07:00
Wink Saville
82c1a5dea3 Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE 2011-06-14 14:44:12 -07:00
Jamie Gennis
6d99a3937d Merge changes I47f147f8,Id09915c9,Iabc6d27c 
* changes:
  SurfaceTexture: increase the test's Surface layer.
  SurfaceTexture: add some RGBA_8888 tests.
  SurfaceTextureClient: minor test refactoring.
 2011-06-14 14:15:11 -07:00
Kazuhiro Ondo
98e1e28f30 Enforce provision check for CSIM record only. 
Change-Id: I94bb6dd9191b24b0bd8c0e7d6267de5cd4b82be8
 2011-06-14 13:55:24 -07:00
Kazuhiro Ondo
c65d52b148 Make APN re-connect delay configuable 
Add configurability on hard coded timer.

Change-Id: Ic9a6ee43d9da3bd45f862aa3a21f05d836b402e3
 2011-06-14 13:54:33 -07:00
Kazuhiro Ondo
23f646367d Revert "CDMALTE: Get roaming status based on SID/NID" 
This reverts commit 3fc9055c7f3bc25948f17bc29582abae72fe7de1.
 2011-06-14 13:53:39 -07:00
Adam Powell
146a0103f4 Merge "Fix bug 4551701 - com.android.browser: java.lang.IllegalStateException" 2011-06-14 13:47:45 -07:00
Adam Powell
e0adac0e72 Fix bug 4551701 - com.android.browser: java.lang.IllegalStateException 
Fix a bug with split action bars and orientation changes.

Change-Id: If067803281c6ac23b51da5bf075fdf1be28afdc2
 2011-06-14 13:46:30 -07:00
Jamie Gennis
fba5fcf367 SurfaceTexture: increase the test's Surface layer. 
This change increases the Surface layer used for displaying the test
results so that the tests will be visible over other windows in the
system.

Change-Id: I47f147f8743ff2a39d57d551811668371202bd31
 2011-06-14 13:45:53 -07:00
Jamie Gennis
d23398d40c SurfaceTexture: add some RGBA_8888 tests. 
Change-Id: Id09915c98a00eca1209b7dab32039a06d260908e
 2011-06-14 13:45:53 -07:00
Jamie Gennis
3c7d846c26 SurfaceTextureClient: minor test refactoring. 
Change-Id: Iabc6d27ca35d30d896c6aef65c4f1b5a1eed47b8
 2011-06-14 13:45:52 -07:00
Doug Zongker
ff24bf439f Merge "deprecate RADIO constant, add getRadioVersion method" 2011-06-14 13:39:36 -07:00
Jamie Gennis
44ce622fc3 Merge "SurfaceTexture: add a format querying test." 2011-06-14 13:39:05 -07:00
Mathias Agopian
9ee3975883 am a9007fbd: am 69b4587b: DO NOT MERGE. may fix build on some version of gcc 
* commit 'a9007fbdae6671f66535da4b9dad04b19aaf9186':
  DO NOT MERGE. may fix build on some version of gcc
 2011-06-14 13:30:34 -07:00
Mathias Agopian
a9007fbdae am 69b4587b: DO NOT MERGE. may fix build on some version of gcc 
* commit '69b4587bfbb3e98f793959d9123340360fa233a2':
  DO NOT MERGE. may fix build on some version of gcc
 2011-06-14 13:26:38 -07:00
RoboErik
849d78973c Merge "Rename Calendar.java to CalendarContract.java" 2011-06-14 13:24:40 -07:00
Alex Sakhartchouk
9b309b99f7 Merge "Allocation copy functions." 2011-06-14 13:14:57 -07:00
Dianne Hackborn
711516d140 resolved conflicts for merge of 77fc8b80 to master 
Change-Id: I014f9a886d6f05607d2a5d101ad2052a6841ee8d
 2011-06-14 12:17:35 -07:00
Mathias Agopian
69b4587bfb DO NOT MERGE. may fix build on some version of gcc 
Change-Id: Iff6d9ab3a7caf58f65fc3f60633a3bd577b7af25
 2011-06-14 12:05:42 -07:00
Doug Zongker
ad2171acf4 deprecate RADIO constant, add getRadioVersion method 
On many devices the radio version system property is only available
when the radio is on, which is frequently not the case when the static
initializers for the Build class are run (eg, if the system has just
booted).  This means RADIO is forever "unknown" on these devices.
Deprecate it and add a method to return the radio version instead.
Apps will still have to deal with getting a null back if the radio
version is currently unavailable.

Change-Id: I63528eae93e1b9d0f7cec5a382724d0391ba1104
 2011-06-14 11:51:59 -07:00
Mathias Agopian
f0b517d9d2 Merge "may fix build on some version of gcc" 2011-06-14 11:51:24 -07:00
Mathias Agopian
f1df0407c6 may fix build on some version of gcc 
Change-Id: Ia88787c0432ec84d51fe505fd6a2b6f98ebe8f33
 2011-06-14 11:50:22 -07:00
Dianne Hackborn
8a73d21184 am 74c48f2b: am 700a1f25: Merge "Update resources documentation with new qualifiers." into honeycomb-mr2 
* commit '74c48f2b2b7084e1bfddb2dddf7587b0cf821ea6':
  Update resources documentation with new qualifiers.
 2011-06-14 11:42:09 -07:00
Dianne Hackborn
77fc8b8066 am 6c0533f9: am c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2 
* commit '6c0533f994e7991b3bd60cab48362e8e2e6d86f0':
  Add new landscape and portrait orientation features.
 2011-06-14 11:40:06 -07:00
RoboErik
bec6c36b96 Rename Calendar.java to CalendarContract.java 
Change-Id: Iadb22f39d1cb3d57d1636360df24ef484a9edb58
 2011-06-14 11:39:35 -07:00
Dianne Hackborn
74c48f2b2b am 700a1f25: Merge "Update resources documentation with new qualifiers." into honeycomb-mr2 
* commit '700a1f25719138b94c453beb6325e627a11a9883':
  Update resources documentation with new qualifiers.
 2011-06-14 11:38:01 -07:00
Dianne Hackborn
6c0533f994 am c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2 
* commit 'c5193c6285d7094fb86dcb5cd56f44a3788af7c2':
  Add new landscape and portrait orientation features.
 2011-06-14 11:36:05 -07:00
Daisuke Miyakawa
a7932ae77e Merge "Fix commment" 2011-06-14 11:30:47 -07:00
Dianne Hackborn
700a1f2571 Merge "Update resources documentation with new qualifiers." into honeycomb-mr2 2011-06-14 11:27:09 -07:00
Dianne Hackborn
c5193c6285 Merge "Add new landscape and portrait orientation features." into honeycomb-mr2 2011-06-14 11:24:29 -07:00
Dianne Hackborn
e289bff0ec Add new landscape and portrait orientation features. 
Updates aapt to know about these.  Also updates aapt badging to:

- No longer crash due to the change to how we match unspecified
configuration resources.
- Report the new "smallest screen" supported screen configs.
- Infer old screen size buckets based on new smallest width attrs.
- Report all of the different labels and icons in an app.

Change-Id: I7376042b817391bd070f549cebbc7f03be4635c8
 2011-06-14 11:23:52 -07:00
tedbo
114420f531 Merge "Support for setting a ParcelSurfaceTexture as the MediaPlayer sink." 2011-06-14 11:18:30 -07:00
Alex Sakhartchouk
304b1f5497 Allocation copy functions. 
Change-Id: Idce6d44a4f4bb2e399284a40c0f90dc1bff912fd
 2011-06-14 11:13:19 -07:00
Chia-chi Yeh
fd1235fc34 Merge "VPN: do not allow zero prefix length in routing rules." 2011-06-14 10:58:20 -07:00
Chia-chi Yeh
57aa13ebde Merge "VPN: do not use gateway in routing rules." 2011-06-14 10:58:10 -07:00
Daisuke Miyakawa
52e3823bd7 Fix commment 
Change-Id: I26ea16636356c1473bf8745247b43fa9dac611c3
 2011-06-14 10:56:46 -07:00
RoboErik
b2e9cde84b Merge "Update Calendar main comment" 2011-06-14 10:27:12 -07:00
RoboErik
260598d0cf Update Calendar main comment 
Change-Id: I5fbbf8d6830a8fdecde2f74b51420bfede87cde9
 2011-06-14 10:26:41 -07:00
John Wang
7c1650d180 am aabe5f46: am 49572479: Update sim missing message in lock screen. 
* commit 'aabe5f46846a45163be874dca2d19910ce38c232':
  Update sim missing message in lock screen.
 2011-06-14 10:17:51 -07:00
Gloria Wang
85e76662b6 Merge "Duplicated fileDesc is not closed when input file is not forward-lock content. Fix for bug 4606053." 2011-06-14 10:05:55 -07:00