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

49796 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
8550f3b86a resolved conflicts for merge of 0a46db5d to honeycomb-plus-aosp 
Change-Id: I0f1bea54d999ab3ef10400ee67bd4d3b2a5d1783
 2011-07-15 09:55:48 -07:00
Robert Greenwalt
0a46db5d88 Apply the dns and route diff which we get a change 
bug:5008973
Change-Id: Ib99e43d9d852452cc1f2aea6bef07bbd194f28cc
 2011-07-14 18:12:14 -07:00
John Wang
74c425d3e9 am 54b2a326: Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE 
* commit '54b2a3262738cdb3d0df747d8719e9a3cac33dfc':
  Show SIM blocked after 10 time puk wrong entries.
 2011-07-14 14:00:58 -07:00
John Wang
54b2a32627 Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE 2011-07-14 13:59:10 -07:00
John Wang
98c3fcc7af Show SIM blocked after 10 time puk wrong entries. 
After user enters 10 time wrong puk in puk unlock screen,
device need show the SIM permanently disabled message
is in lock screen.

bug:4905509
Change-Id: I06242834972b3f403cfe99a2edd8bae47d7ed474
 2011-07-14 11:46:24 -07:00
Wink Saville
3810361e4a am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE 
* commit '6d1d16c324a681dd966d47497a71a02eac512234':
  Remove STOPSHIP but allow seamless Handoff when possible.
 2011-07-13 14:19:12 -07:00
Wink Saville
6d1d16c324 Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE 2011-07-13 14:15:19 -07:00
Wink Saville
e822225f7a Remove STOPSHIP but allow seamless Handoff when possible. 
If an address is removed we must reset the connection but
only for the connections associated with that address. For
now we're doing the "all" addresses for a type (IPv6 or IPv4)
in the future we only need to reset a particular addresses
connections.


Bug: 4981919
Change-Id: I97f8071a3ed6f827ed22f32216ca5011bfe6c1d9
 2011-07-13 13:44:13 -07:00
Jaikumar Ganesh
6dd4531639 resolved conflicts for merge of ab3ec176 to honeycomb-plus-aosp 
Change-Id: I75fcd15f85f2cb3912ada1df453fb02bd13e5d85
 2011-07-13 12:29:57 -07:00
Jaikumar Ganesh
ab3ec17608 am 9ff89495: am 53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery" 
* commit '9ff89495a4890191a0bc5dfddf28f23f79f23698':
  Bluetooth: correcting return value from cancelDiscovery
 2011-07-13 10:25:27 -07:00
Jaikumar Ganesh
9ff89495a4 am 53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery" 
* commit '53cf7858c3fd36082302efdc4d848925bcc0001e':
  Bluetooth: correcting return value from cancelDiscovery
 2011-07-13 10:22:40 -07:00
John Wang
28d92afc0a am 2ac78a2d: Merge "Add getImei() to Phone interface." into honeycomb-LTE 
* commit '2ac78a2da52b29f6ac72294072d7ca87d991dab1':
  Add getImei() to Phone interface.
 2011-07-13 10:21:38 -07:00
John Wang
2ac78a2da5 Merge "Add getImei() to Phone interface." into honeycomb-LTE 2011-07-13 10:17:22 -07:00
Jaikumar Ganesh
53cf7858c3 Merge "Bluetooth: correcting return value from cancelDiscovery" 2011-07-13 10:04:19 -07:00
John Wang
2ea7e443b2 Add getImei() to Phone interface. 
Need IMEI to be displayed in LTE Settings. Since getDeviceId() returns MEID for LTE device,
getImei() is added to return IMEI for all devices. getImei returns null if not set (as SipPhone).

bug:4983512
Change-Id: Idfe2ec8de514f330248db7a9de7e241f9a38cb96
 2011-07-11 17:00:16 -07:00
David 'Digit' Turner
0814a9aa0c am db4c5f35: resolved conflicts for merge of 7816eded to gingerbread-plus-aosp 
* commit 'db4c5f352d6eb8e248953ccff1dbecb1270af4c5':
  NativeDaemonConnector: Fix SDCard mounting bug in the emulator.
  Fix missing NL
 2011-07-11 16:15:27 -07:00
Scott Main
9b446cd6b4 am bc047bb0: am e32c49ab: docs: de-new sidenavs 
* commit 'bc047bb03e6084ded47ffd5d810045ca973d54e5':
  docs: de-new sidenavs
 2011-07-11 16:08:27 -07:00
Scott Main
bc047bb03e am e32c49ab: docs: de-new sidenavs 
* commit 'e32c49ab2c5d6b347b39635a0202d7dbdc1f0769':
  docs: de-new sidenavs
 2011-07-11 16:06:25 -07:00
Robert Ly
4e40015899 am 1e4cf2dd: am 10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a 
* commit '1e4cf2dddbac4d357731ffaf02c4402426aa3763':
  cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
 2011-07-11 16:05:40 -07:00
Robert Ly
1e4cf2dddb am 10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a 
* commit '10a36020e3d37ef088f5f7ed6d64ba35847fc069':
  cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
 2011-07-11 16:03:30 -07:00
Scott Main
e32c49ab2c docs: de-new sidenavs 
Change-Id: I2aaafe763e4b006059222677e563963d3284d314
 2011-07-11 16:03:10 -07:00
Robert Ly
10a36020e3 cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a 
Change-Id: I4cb22b628978c86b5c07ff80b2fe8547e25015a1
 2011-07-11 15:58:28 -07:00
David 'Digit' Turner
db4c5f352d resolved conflicts for merge of 7816eded to gingerbread-plus-aosp 
Change-Id: I1f7d1f488f6a86774962d427aca472a8a444e0aa
 2011-07-12 00:57:09 +02:00
Scott Main
22f4e8f627 am 56a085c9: am d3fa7bd1: docs: fix date on opengl dashboard 
* commit '56a085c98801d9c4b08cbf398d8225b6761816ac':
  docs: fix date on opengl dashboard
 2011-07-11 15:53:09 -07:00
Scott Main
56a085c988 am d3fa7bd1: docs: fix date on opengl dashboard 
* commit 'd3fa7bd1e873d885f00b11bb8123284357ccd362':
  docs: fix date on opengl dashboard
 2011-07-11 15:50:16 -07:00
Scott Main
d3fa7bd1e8 docs: fix date on opengl dashboard 
Change-Id: I0d4443664fb61466de441c1be702a351fbf28ac1
 2011-07-11 15:47:41 -07:00
Xavier Ducrohet
9163a4a686 am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1. 
* commit 'aa4b1d8ba9d5e317b67638b764d92d17fb810aa0':
  Merge 36a3a392 from mr1.
 2011-07-11 12:46:07 -07:00
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
3b219a51a9 am 4821d3bd: Merge "VpnService: stop VPN when unknown DNS servers show up." into honeycomb-LTE 
* commit '4821d3bdf8ce35408c6a10fe45c39a5e701ea8e2':
  VpnService: stop VPN when unknown DNS servers show up.
 2011-07-11 10:29:32 -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
0ddd996006 am 12b91edc: Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE 
* commit '12b91edc81763b69090bf5815bc8d59ab8d8f342':
  Add a property so that CSIM provision check can be bypassed
 2011-07-10 19:35:14 -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
a9e00a4ac8 am 89799e72: Fix incorrect ERI banner format 
* commit '89799e72eee54935ec5830f89dfd0a7d32983917':
  Fix incorrect ERI banner format
 2011-07-10 17:21:52 -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
99cd66711b am 64ba5eaa: Concurrent multi-PDP support in TrafficStats 
* commit '64ba5eaa40614877c679b3fbaaa3c2efd17d50d2':
  Concurrent multi-PDP support in TrafficStats
 2011-07-10 16:16:54 -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
d9f91425fc am 6b98e712: am 3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2 
* commit '6b98e7128b3fbfd8b2c421286c403e4609c69708':
  cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052
 2011-07-08 10:44:10 -07:00
Joe Malin
f84bb99771 am 230ef987: am 0e89d916: Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2 
* commit '230ef98728f3b59a81f55dab5129aa50d5f27969':
  DOC CHANGE: Change GTV info on intro page
 2011-07-08 10:41:54 -07:00
Joe Fernandez
d1c15f96dd am 20f65201: am 0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2 
* commit '20f6520197a6b70123d2ff7c466ee58349ae3032':
  cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
 2011-07-08 10:41:35 -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
Wink Saville
3ef341cda5 am 7283bb93: Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE 
* commit '7283bb9323c83621a818c387bb80fe1bc9d6aa7c':
  Disconnect ApnContexts in INITING state when error.
 2011-07-08 09:40:11 -07:00
Wink Saville
e4a56a32ac am 8171e6f6: Use resetConnections with resetMask. 
* commit '8171e6f690cca1bad354e7e352823d79d420daf3':
  Use resetConnections with resetMask.
 2011-07-08 09:40:08 -07:00
Wink Saville
a736cd54e1 am 848aa3ab: Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE 
* commit '848aa3ab8a00835c5af2ead954c7736e507249b5':
  No need to have BASE_DATA_CONNECTION_TRACKER start at 50000.
 2011-07-08 09:40:03 -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
David 'Digit' Turner
7816eded41 merge intel x86 patches into gingerbread branch 2011-07-08 18:19:01 +02:00