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

48602 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
aa4b1d8ba9 am d292d2a0: Merge 36a3a392 from mr1. 
* commit 'd292d2a03134eaca8b51b6313610b4b78de53c83':
  Merge 36a3a392 from mr1.
 2011-07-11 12:43:15 -07:00
Xavier Ducrohet
d292d2a031 Merge 36a3a392 from mr1. 
Protect against OOB index in BridgeTypedArray.

Change-Id: I40be1e039f9eb36c182b6522bd50d6ed98e15b5c
 2011-07-11 12:02:51 -07:00
Chia-chi Yeh
4821d3bdf8 Merge "VpnService: stop VPN when unknown DNS servers show up." into honeycomb-LTE 2011-07-11 10:25:28 -07:00
Wink Saville
12b91edc81 Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE 2011-07-10 19:33:54 -07:00
Kazuhiro Ondo
e5d891e84e Add a property so that CSIM provision check can be bypassed 
To support test environment where a call box is used with
non-provisioned SIM.

Bug: 5010622
Change-Id: I0dd2d3c2d199f600e5979c865f97b41e2fbb706d
 2011-07-10 19:18:21 -07:00
Kazuhiro Ondo
89799e72ee Fix incorrect ERI banner format 
Fix conflicting display issue with ERI and CSIM SPN test.
Do not display them together but only override ERI text with CSIM
SPN in home area.

Bug: 5008969
Change-Id: I88383acd1c7f4c5bfb1f66349ff2f37b2edbbc9c
 2011-07-10 16:26:42 -07:00
Kazuhiro Ondo
64ba5eaa40 Concurrent multi-PDP support in TrafficStats 
Quick fix to enable concurrent multiple PDP support in TrafficStats.
Just updated the list of hard-coded mobile interfaces for now.

Bug: 4553527
Change-Id: I44ce73f3000542d6457f353bb561a2275684af6b
 2011-07-10 14:40:43 -07:00
Chia-chi Yeh
6a4610a1dc VpnService: stop VPN when unknown DNS servers show up. 
Bug: 5002601
Change-Id: I5459db009e7391ff874623cb1830065ac75c80ed
 2011-07-08 17:59:54 -07:00
Robert Ly
6b98e7128b am 3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2 
* commit '3f3b8cbfa775f2ebff985c069300f8daaeb7a84c':
  cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052
 2011-07-08 10:39:46 -07:00
Robert Ly
3f3b8cbfa7 Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2 2011-07-08 10:13:28 -07:00
Joe Malin
230ef98728 am 0e89d916: Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2 
* commit '0e89d916f078a518093c476725fa7e0798dcc590':
  DOC CHANGE: Change GTV info on intro page
 2011-07-08 09:39:25 -07:00
Joe Fernandez
20f6520197 am 0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2 
* commit '0fbe1dfb8df94a51d79e9a42fcbaebed6f6e516e':
  cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
 2011-07-08 09:39:22 -07:00
Wink Saville
7283bb9323 Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE 2011-07-07 22:00:56 -07:00
Joe Malin
0e89d916f0 Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2 2011-07-07 18:19:18 -07:00
Ramesh Sudini
910e80478d Disconnect ApnContexts in INITING state when error. 
When DCT tears down a link due to error, the ApnContexts which are in INITING state are
not torndown. Due to this the DC refCount does not hit 0, and the Data Link is not torndown.

Bug: 4973894
Change-Id: If1263f360d55f6874220235fede294909db4837e
 2011-07-07 16:35:52 -07:00
Wink Saville
8171e6f690 Use resetConnections with resetMask. 
Bug: 4981919
Change-Id: I5dec2da0756d5083bc81494fd583672704537694
 2011-07-07 16:17:06 -07:00
Joe Fernandez
0fbe1dfb8d Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2 2011-07-07 15:03:55 -07:00
Wink Saville
848aa3ab8a Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE 2011-07-07 14:39:23 -07:00
Wink Saville
8735a07a64 No need to have BASE_DATA_CONNECTION_TRACKER start at 50000. 
Update comment that values should be changed after releasing.

Change-Id: I10ed6a0238e4f5be866dd97cfb56c5e7c84ddb52
 2011-07-07 14:16:30 -07:00
Scott Main
e4e1c3fda9 am 40afb97c: cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps 
* commit '40afb97c3289cd3daae9a31f4829d660ba747d37':
  cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
 2011-07-07 10:13:44 -07:00
Scott Main
0657e1a7e7 am 77dfe217: cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards 
* commit '77dfe2173e2970a6a662b7d9537715c81886185e':
  cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
 2011-07-07 10:10:29 -07:00
Scott Main
40afb97c32 cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 
docs: add button builder for android market apps

Change-Id: I0d9da685f850f92737c2d9d3eb758b41dbec0a39
 2011-07-07 10:08:15 -07:00
Scott Main
77dfe2173e cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb 
docs: update dashboards

Change-Id: Ib37f2b8a3bf8c9c7ae09ea2edbeeb707899abf58
 2011-07-07 09:58:33 -07:00
Wink Saville
48b6d5afae Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE 2011-07-06 19:04:30 -07:00
Kazuhiro Ondo
378a4380f2 Reset FAILED ApnContext state to IDLE on data setup triggers 
Make sure FAILED ApnContext state is reset to IDLE regarless of
existence of the reconnect alarm. This is to let FW re-evaluate
call setup conditions properly on data setup triggers.

Bug: 4989604
Change-Id: Ia9ec439db1df03bbd2e56803d3558542ba5f5400
 2011-07-06 18:45:06 -07:00
Robert Ly
027654e90d am ad2724de: cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8 
* commit 'ad2724de956955b0ddf95491f6cb378f54dafde5':
  cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
 2011-07-06 18:17:53 -07:00
Robert Ly
ad2724de95 cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8 
Change-Id: I763f02a523c7467e7c0241197e8f2652ed7d4f9c
 2011-07-06 17:47:47 -07:00
Kazuhiro Ondo
c8e2916d0b Bring back ERI into CDMA-LTE mode 
Use ERI mechanism for roaming determination in CDMA-LTE mode.
Also display SPN name from CSIM card as "SPN" field in the status bar.
PLMN field will be derived from ERI text as done in original CDMA phone.

Bug: 4970448
Change-Id: I21382b15e148a8451f4c3fcbbb5d1ed296e41b5a
 2011-07-06 17:30:52 -07:00
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
97667d0cb3 Merge "Allow vril-dump to work on user builds" into honeycomb-LTE 2011-07-06 12:08:05 -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
Joe Malin
16f191feaa DOC CHANGE: Change GTV info on intro page 
Change-Id: I5175d96bd8aa88bf65d8cd0e8bffb4eae7241ebe
 2011-07-01 16:00:00 -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
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
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
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
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
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
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
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
Dianne Hackborn
5db9ff97aa Update final 13 API def. 
Change-Id: I90cb38f575dd1b92a3694bb5cd091f5d595cee11
 2011-06-27 15:09:40 -07:00
Robert Ly
0711c86c38 am 81cbc294: Merge "docs: fixing new superscript for rs" into honeycomb-mr2 
* commit '81cbc294ddb08c2bc08be9b2abbbcc7c19ec88d9':
  docs: fixing new superscript for rs
 2011-06-27 11:49:30 -07:00
Robert Ly
81cbc294dd Merge "docs: fixing new superscript for rs" into honeycomb-mr2 2011-06-27 11:45:41 -07:00
Robert Ly
491a6de28d docs: fixing new superscript for rs 
Change-Id: I0563842a3a43972b131a2ec30ed8357b8136fc6d
 2011-06-27 10:33:01 -07:00
Anirudh Dewani
3ba39ef20f am 1f82dc08: Merge "Typo in spinner tutorial." into honeycomb-mr2 
* commit '1f82dc08f1616a83d8d1c43fa9ac16d0d60dd537':
  Typo in spinner tutorial.
 2011-06-26 23:06:04 -07:00
Anirudh Dewani
1f82dc08f1 Merge "Typo in spinner tutorial." into honeycomb-mr2 2011-06-26 23:02:56 -07:00