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

49935 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
dbad9d4e98 cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c 
Change-Id: I6401f568ec132d959d57f32caa8b45b2613229e6
 2011-07-06 15:36:45 -07:00
Robert Ly
31ee77eb2a cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052 
Change-Id: I57ea8e2ace24a777603513340302265138711590
 2011-07-06 12:22:21 -07:00
Wink Saville
5eeeea29ec am 97667d0c: Merge "Allow vril-dump to work on user builds" into honeycomb-LTE 
* commit '97667d0cb3d5aecca7210c70a302f7a667330708':
  Allow vril-dump to work on user builds
 2011-07-06 12:09:48 -07:00
Wink Saville
97667d0cb3 Merge "Allow vril-dump to work on user builds" into honeycomb-LTE 2011-07-06 12:08:05 -07:00
Robert Ly
f870327d5d am bc45fcbb: am 205d1c34: cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0 
* commit 'bc45fcbb44fb6af0e99446c0e56eba8238de9e90':
  cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0
 2011-07-06 11:26:27 -07:00
Robert Ly
bc45fcbb44 am 205d1c34: cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0 
* commit '205d1c34e3289b05700e6caab718de169ad82b90':
  cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0
 2011-07-06 11:22:20 -07:00
John Michelau
790d2e4d69 Allow vril-dump to work on user builds 
Run vril-dump without "su root" when ro.build.type=user.  Also add inet
perms for dumpstate, so that it can communicate with basebands that
have IP-based interfaces.

Bug: 4993955
Change-Id: Icc65ba0f80756db1f63f12f89f9973a55bf405f2
 2011-07-06 09:30:28 -07:00
Robert Greenwalt
37dbfcaf83 am 7022db4c: am 2b62c4fb: am 38bb0123: Merge "Added methods to support dns cache per interface" 
* commit '7022db4cd2ca3721631595d7379eabb2cc77f6a9':
  Added methods to support dns cache per interface
 2011-07-06 07:48:21 -07:00
Robert Greenwalt
7022db4cd2 am 2b62c4fb: am 38bb0123: Merge "Added methods to support dns cache per interface" 
* commit '2b62c4fbfeb7df0988bf216c50cd4a24f05add9f':
  Added methods to support dns cache per interface
 2011-07-06 07:42:19 -07:00
Robert Greenwalt
2b62c4fbfe am 38bb0123: Merge "Added methods to support dns cache per interface" 
* commit '38bb0123b8b9857c3119fd359739daf872f619d6':
  Added methods to support dns cache per interface
 2011-07-06 07:35:02 -07:00
Joe Malin
16f191feaa DOC CHANGE: Change GTV info on intro page 
Change-Id: I5175d96bd8aa88bf65d8cd0e8bffb4eae7241ebe
 2011-07-01 16:00:00 -07:00
Robert Greenwalt
38bb0123b8 Merge "Added methods to support dns cache per interface" 2011-07-01 09:26:50 -07:00
Kazuhiro Ondo
c0c07d4ff6 am 012b86d4: DataConnection was cleaned up too early if it\'s already disconnecting 
* commit '012b86d4294182497c4c72a318e0f4cbe5075a44':
  DataConnection was cleaned up too early if it's already disconnecting
 2011-06-30 18:00:06 -07:00
Kazuhiro Ondo
012b86d429 DataConnection was cleaned up too early if it's already disconnecting 
Fix one logic failure introduced in patch for bug 4901019.

Bug: 4970726
Change-Id: Ifc4071b1cbf0c19fbd8356d7dcc16f9df39d4b54
 2011-06-30 17:26:54 -07:00
Robert Greenwalt
672c468c45 am a2267451: Don\'t ever report a null ServiceState 
* commit 'a2267451ddf91cc330f4c283e86811e38328915b':
  Don't ever report a null ServiceState
 2011-06-30 14:50:32 -07:00
Robert Greenwalt
a2267451dd Don't ever report a null ServiceState 
Report out of service if we don't know any better.  Sometimes when switching radios
we were finding nulls reported - it crashed some code and highlighted this problem.
If we don't have a service state we're certainly out of service, so this isn't a lie.

bug:4553701
Change-Id: I094798a5f9f39f45c0ba30179aaa8f88f9b3e405
 2011-06-30 12:42:57 -07:00
Conley Owens
e0009bb0b7 am 98395483: am 9f2cbf14: am e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications." 
* commit '98395483e4309f7b92348136491575861008b3c0':
  Add FLAG_AUTO_CANCEL flag for multiple supl notifications.
 2011-06-30 08:25:13 -07:00
Conley Owens
98395483e4 am 9f2cbf14: am e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications." 
* commit '9f2cbf14f8d79e6ed48ff9d76f6aaede45185418':
  Add FLAG_AUTO_CANCEL flag for multiple supl notifications.
 2011-06-30 08:22:10 -07:00
Conley Owens
9f2cbf14f8 am e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications." 
* commit 'e06749e14c1fb2d78540cba9548ee3b4b7b3b1d9':
  Add FLAG_AUTO_CANCEL flag for multiple supl notifications.
 2011-06-30 08:19:00 -07:00
Conley Owens
e06749e14c Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications." 2011-06-30 08:11:25 -07:00
Kazuhiro Ondo
0562efd1ea am f3f9967e: Make sure to update data availability in call setup capable triggers. 
* commit 'f3f9967e22201276d65f4be6006aca1cecc2a604':
  Make sure to update data availability in call setup capable triggers.
 2011-06-29 17:24:56 -07:00
Kazuhiro Ondo
f3f9967e22 Make sure to update data availability in call setup capable triggers. 
As "startUsingNetworkFeature()" now can trigger the initial data
connection instead of default data, FW needs to make sure each
MobileDataStateTracker is updated with the data availability
on each "data-setup capable" trigger.

Bug: 4970825
Change-Id: I6a7e479ecc1534cd723a2e8beece6b8bcd398ea7
 2011-06-29 15:37:26 -07:00
Robert Greenwalt
8745caaf25 am dbcc57c6: Fix dependencyMet issues regarding hipri APN. 
* commit 'dbcc57c6f1602da324609ddbaf76f836504733ae':
  Fix dependencyMet issues regarding hipri APN.
 2011-06-29 15:22:50 -07:00
Robert Greenwalt
dbcc57c6f1 Fix dependencyMet issues regarding hipri APN. 
If the system says a dependency isn't met for accessing the default APN,
apps should not be able to turn on the hipri APN either.  This change
prevents apps from adjusting the dependencyMet setting on hipri and
internally ties its dependencyMet to that of the default APN.

bug:4643411
Change-Id: I7e609ff9bb1b85a3a6a41095052f0194d03be979
 2011-06-29 14:28:53 -07:00
Robert Ly
205d1c34e3 cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0 
Change-Id: If1091fd0a7934440e73731825d24ab8c519656ab
 2011-06-29 11:29:20 -07:00
Scott Main
846764e5aa am d3cc051d: am a6870450: cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks 
* commit 'd3cc051dcb05a32eba1c208792e1bde4654a6db3':
  cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
 2011-06-28 20:57:40 -07:00
Scott Main
d3cc051dcb am a6870450: cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks 
* commit 'a687045045157eab2dbf657bb085cb0af68d72f2':
  cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
 2011-06-28 20:50:12 -07:00
Scott Main
a687045045 cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e 
docs: fix game controller trademarks

Change-Id: I1eca030bad5bae0c581000fefffd5d3d49aac205
 2011-06-28 20:45:32 -07:00
Xavier Ducrohet
e1918353e7 am 842725fc: (-s ours) am 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into gingerbread 
* commit '842725fc642b7ba2c087cc81796973b838c23c76':
  Bring in more layout lib changes from hc-mr1.
 2011-06-28 19:14:05 -07:00
Xavier Ducrohet
660447379d am 9bce27a9: (-s ours) am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread 
* commit '9bce27a9ce916bdf363667ee67fc0ce50c533aa3':
  CherryPick 06942bc4 from hc-mr1. do not merge.
 2011-06-28 18:58:09 -07:00
Xavier Ducrohet
d7542263c6 am 155cf6c1: (-s ours) am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread 
* commit '155cf6c1e191bb03fe24db8663715862d8e6a43d':
  CherryPick 988eeeb5 from hc-mr1. do not merge.
 2011-06-28 18:56:17 -07:00
Xavier Ducrohet
adf5914b39 am e0947693: (-s ours) am 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread 
* commit 'e0947693c9984727dfa775a747dd32aaaeb90284':
  DO NOT MERGE. may fix build on some version of gcc
 2011-06-28 18:56:14 -07:00
Xavier Ducrohet
842725fc64 am 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into gingerbread 
* commit '4d825e1f3bb6b52ecbea6f0c4aa2081b7f1edc89':
  Bring in more layout lib changes from hc-mr1.
 2011-06-28 18:55:46 -07:00
Xavier Ducrohet
9bce27a9ce am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread 
* commit '4753498d5c1ac3cf93b0730e77946a95b6913a82':
  CherryPick 06942bc4 from hc-mr1. do not merge.
 2011-06-28 18:55:42 -07:00
Xavier Ducrohet
155cf6c1e1 am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread 
* commit '9918ffb07f47430e22f6e53576d59b599f5a3534':
  CherryPick 988eeeb5 from hc-mr1. do not merge.
 2011-06-28 18:53:54 -07:00
Xavier Ducrohet
e0947693c9 am 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread 
* commit '54146a634e0e66a5e4732ba1a80079a1e93bdd8a':
  DO NOT MERGE. may fix build on some version of gcc
 2011-06-28 18:53:51 -07:00
Xavier Ducrohet
4d825e1f3b Merge "Bring in more layout lib changes from hc-mr1." into gingerbread 2011-06-28 18:53:15 -07:00
Xavier Ducrohet
4753498d5c Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread 2011-06-28 18:53:06 -07:00
Xavier Ducrohet
9918ffb07f Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread 2011-06-28 18:52:59 -07:00
Xavier Ducrohet
54146a634e Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread 2011-06-28 18:52:43 -07:00
mike wakerly
430cee0961 am af08ddbc: am 2f9ad8b4: Add intent actions for new firmware events. 
* commit 'af08ddbc42fb51de76958d859cf0e87d0b9e475e':
  Add intent actions for new firmware events.
 2011-06-28 17:22:53 -07:00
mike wakerly
af08ddbc42 am 2f9ad8b4: Add intent actions for new firmware events. 
* commit '2f9ad8b499cb150d5cdfe84a9795992c5dd42cff':
  Add intent actions for new firmware events.
 2011-06-28 17:19:05 -07:00
Wink Saville
cf2980ffef am 29d1dde9: Merge "Data connection retry pattern could be broken by PDP sharing" into honeycomb-LTE 
* commit '29d1dde972acaaf3685b60de3da00c1809c510f9':
  Data connection retry pattern could be broken by PDP sharing
 2011-06-27 19:57:20 -07:00
Wink Saville
29d1dde972 Merge "Data connection retry pattern could be broken by PDP sharing" into honeycomb-LTE 2011-06-27 19:54:27 -07:00
mike wakerly
2f9ad8b499 Add intent actions for new firmware events. 
Change-Id: I8129b7812c0d551111f0c85eacc9535a441e5453
 2011-06-27 18:46:31 -07:00
Dianne Hackborn
229ff64bde am 351ddeb2: am 5db9ff97: Update final 13 API def. 
* commit '351ddeb2da65fc020e80d77d80f08aa1dfd820d7':
  Update final 13 API def.
 2011-06-27 17:11:15 -07:00
Dianne Hackborn
351ddeb2da am 5db9ff97: Update final 13 API def. 
* commit '5db9ff97aa8f36f330f41f5ae42467795ef075b8':
  Update final 13 API def.
 2011-06-27 17:07:29 -07:00
Josiah Gaskin
9bf34ca6f8 Add dependency generation to Aapt for R.java 
Make Aapt generate a dependency file in the location specified
by RClassDir for R.java if the --generate-dependencies flag is set.
This dependency file is then read by the ant exec loop task
to see whether to recreate R.java.

Change-Id: I7152dac86b6ea0e448ef65e3a95694afe233c789
 2011-06-27 16:44:57 -07:00
Josiah Gaskin
ce89f1531e Copy once-created R.java into library projects 
This change adds functionality in Aapt to allow specification of
library projects to copy the generated R.java file into rather
than regenerating the file for each library project.

Change-Id: I05939d1dc875bd875be9298ca47cb639235070c6
 2011-06-27 16:29:38 -07:00
Kazuhiro Ondo
1e5c72c704 Data connection retry pattern could be broken by PDP sharing 
If a DataConnection is pending re-connect alarm, the new request
from another ApnContext sharing the same DC could disrupt
the re-connection pattern currently engaged.

This patch is to ensure the new request for PDP sharing
scenario will not trigger another SETUP_DATA request if
reconnection alarm is set in AlarmManager.

Bug: 4901019
Change-Id: I98b0d9af8b58fb880efdbc0246009de5cb116a54
 2011-06-27 15:12:21 -07:00