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

21276 Commits

Author SHA1 Message Date
The Android Automerger
44e39d608c Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTE 2011-05-08 22:38:02 -07:00
Irfan Sheriff
fba19ff5e8 DO NOT MERGE Define Protocol class 
Adds a common namespace for communication across
different state machines

Change-Id: Ib6a29715c651371f91a950348a8525275b6026a0
 2011-05-06 16:05:53 -07:00
Irfan Sheriff
c351f52a4a DO NOT MERGE Handle GET_POWER failures 
Return a failure when GET_POWER returns a non-conforming
format

Bug: 4380317
Change-Id: Ie723c424ab07774f2be2594aa5deeaa5cd5ac280
 2011-05-06 15:06:30 -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
Jake Hamby
18cc814c94 am 4d53cb02: Merge "Enable support for SMS national language shift tables." into gingerbread 
* commit '4d53cb02168fe35104d7e644dd9b3efd8ca4c91b':
  Enable support for SMS national language shift tables.
 2011-05-05 13:31:03 -07:00
Jake Hamby
4d53cb0216 Merge "Enable support for SMS national language shift tables." into gingerbread 2011-05-05 13:09:11 -07:00
Nicu Pavel
75d14c33d7 Use proper type for oob variable in register_agent. 
Without this change the BluetoothEventLoop crashes on my armv5 arch board.

Change-Id: Ia10382f0aea4736be268512ccf9d5c5cde052851
 2011-05-05 13:11:12 +03:00
Arek Lichwa
ae5fbb0b43 BT: Wrong publishing result of bonding error code. 
During bonding bluez stack publish the error code over dbus.
JNI gets the error, in this ER case:
org.bluez.Error.AuthenticationFailed (Authentication Failed),
and then wrong call to overloaded setBondState() is made on
callstack using default result code parameter as 0 (BOND_SUCCESS).

Change-Id: I6f743cedc76e63d0c2a35e89d3aa48267b89c06e
Signed-off-by: Christian Bejram <christian.bejram@stericsson.com>
 2011-05-05 10:41:25 +02:00
Irfan Sheriff
86654eda96 am 8a14d8b9: am 1a5b6098: Handle GET_POWER failures 
* commit '8a14d8b9c03c611cabde5743cfdcc9ff51314550':
  Handle GET_POWER failures
 2011-05-04 21:19:19 -07:00
Irfan Sheriff
8a14d8b9c0 am 1a5b6098: Handle GET_POWER failures 
* commit '1a5b6098d5002ae07ce3f9bc514400a87c2b64fa':
  Handle GET_POWER failures
 2011-05-04 21:14:47 -07:00
Robert Greenwalt
5673c13b51 am aacd80fd: Fix build break. 
* commit 'aacd80fd87bc08c410853a044967c8f7b417f089':
  Fix build break.
 2011-05-04 16:55:26 -07:00
Robert Greenwalt
aacd80fd87 Fix build break. 
Change-Id: Ic61448f468fb97a2ae032bf5782b33ed8972e20f
 2011-05-04 16:50:10 -07:00
Irfan Sheriff
1a5b6098d5 Handle GET_POWER failures 
Return a failure when GET_POWER returns a non-conforming
format

Bug: 4380317
Change-Id: If1ce73572ae261cd6998e4289e21112c88859437
 2011-05-04 14:23:42 -07:00
Robert Greenwalt
9c7e6fc506 am f13eb830: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE 
* commit 'f13eb8301f4704179938e374129f2943c9c38d5f':
  Add auto-restore timeout for secondary networks.
 2011-05-04 10:02:16 -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
4397c32402 am c535f7f2: DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE" 
* commit 'c535f7f291f0bda688efcee62f21cf44d0ebe38e':
  DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
 2011-05-04 08:57:29 -07:00
Mike Lockwood
21c0800f71 am d3e4290c: DO NOT MERGE MTP and media provider support for multiple storage devices: 
* commit 'd3e4290c0442b6dcf24bcf642f4fc26d12d8e7aa':
  DO NOT MERGE MTP and media provider support for multiple storage devices:
 2011-05-04 08:57:23 -07:00
Mike Lockwood
a2a8419db8 am e3b498be: DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods 
* commit 'e3b498be0ae05367e9b84f4fac2ac5cf57a6b091':
  DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
 2011-05-04 08:57:07 -07:00
Mike Lockwood
c535f7f291 DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE" 
We need this to allow MTP to access secondary external storage devices

This reverts commit 35a2ea2fbf156a503d1b0bc6ca7784e51e2462f4.

Conflicts:

	data/etc/platform.xml

Change-Id: Iaf9cf120217e8417d328a51db0d82be6835b0ff0
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-04 10:41:20 -04:00
Mike Lockwood
d3e4290c04 DO NOT MERGE MTP and media provider support for multiple storage devices: 
- MTP support for multiple storage units

- Add storage_id column to media database for MTP storage ID

- Add framework resource for defining mount points and user visible descriptions
for multiple volumes

- Clean up locking in MtpServer JNI code

Change-Id: I53d501fd4891ebe27408135fb598027e06b7e495
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-04 10:41:20 -04:00
Mike Lockwood
e3b498be0a DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods 
Change-Id: I8ba7e56797b0106dafaa6388393e5c629f27e6e6
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-04 10:41:19 -04:00
Robert Greenwalt
f2102f7a1a Add auto-restore timeout for secondary networks. 
Settable per network so you can have not timeout for some and some for others.
If you set the old NETWORK_RESTORE_DELAY_PROP_NAME system property
(android.telephony.apn-restore) it will override this value.

Change-Id: Icca706fdc74245dce679209116660e5dc4b05d23
 2011-05-03 19:10:26 -07:00
Mike Lockwood
f60ba87f07 DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE" 
We need this to allow MTP to access secondary external storage devices

This reverts commit 35a2ea2fbf156a503d1b0bc6ca7784e51e2462f4.

Conflicts:

	data/etc/platform.xml

Change-Id: I0b139a0f3b369c1080831a5b3a48f5d9a330b1bb
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-03 21:03:56 -04:00
Mike Lockwood
7ae938be1b DO NOT MERGE MTP and media provider support for multiple storage devices: 
- MTP support for multiple storage units

- Add storage_id column to media database for MTP storage ID

- Add framework resource for defining mount points and user visible descriptions
for multiple volumes

- Clean up locking in MtpServer JNI code

Change-Id: Ide6d47bd9aa1698ed2a13d695613e03f2a9b29e3
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-03 21:03:56 -04:00
Mike Lockwood
d967f4664f DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods 
Change-Id: I43d5c1730b340f1288b58012234b38f801001b71
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-03 21:03:55 -04:00
Wink Saville
ee081bf5ee am 3ed0a1ec: Merge "IMS: Provide net_admin permission so that IPSec could be configured/used." into honeycomb-LTE 
* commit '3ed0a1ec7aa6364c236721a1bd29fd196f259cba':
  IMS: Provide net_admin permission so that IPSec could be configured/used.
 2011-05-03 16:33:08 -07:00
Conley Owens
2d40bf91e6 am eac835e5: am 9c4ba258: Merge "Removing dead store; it was likely a relict of debuging code." 
* commit 'eac835e52e8378b33a2b34b7edb803290154588d':
  Removing dead store; it was likely a relict of debuging code.
 2011-05-03 16:14:31 -07:00
Ramesh Sudini
0e7b5a0287 IMS: Provide net_admin permission so that IPSec could be configured/used. 
IMS configures the security database in kernel with keys generated from ISIM.

Change-Id: Iae9fb85f286ff2a627369d784a127bf7d4d8f4b3
 2011-05-03 13:46:08 -07:00
Conley Owens
eac835e52e am 9c4ba258: Merge "Removing dead store; it was likely a relict of debuging code." 
* commit '9c4ba2580e2ef582747cce2960804a2a5e4b776e':
  Removing dead store; it was likely a relict of debuging code.
 2011-05-03 12:07:19 -07:00
Wink Saville
3165f1a8eb am d0d44c4e: Merge "Make DataConnection asynchronous." into honeycomb-LTE 
* commit 'd0d44c4e988ecdea86c2bb04e29d8f6d20c1c631':
  Make DataConnection asynchronous.
 2011-05-02 23:44:16 -07:00
Wink Saville
d0d44c4e98 Merge "Make DataConnection asynchronous." into honeycomb-LTE 2011-05-02 23:41:29 -07:00
Wink Saville
0b80114a2d Make DataConnection asynchronous. 
Change-Id: Ic0e01dded25ba1fdb3b2c6d0f95a1193f608a0e0
 2011-05-02 21:55:04 -07:00
Robert Greenwalt
db46fa25be am a47c4019: Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE 
* commit 'a47c40193fcbe9ca07facea78b2828afdae5e025':
  Add RouteInfo objects for tracking routes.
 2011-05-02 13:29:22 -07:00
Robert Greenwalt
a47c40193f Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE 2011-05-02 13:26:52 -07:00
Irfan Sheriff
d369d64ee7 am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE 
* commit '8ab6a6d415156bb543a735612fbbdecfbff6c3a4':
  Add DhcpStateMachine for interation with dhcpcd
 2011-05-02 12:26:52 -07:00
Wink Saville
210830664d am 7e74c60d: Merge "Enhance AsyncChannel." into honeycomb-LTE 
* commit '7e74c60db5261ea137c8f6672f8573873eb5814e':
  Enhance AsyncChannel.
 2011-05-02 11:51:36 -07:00
Irfan Sheriff
8ab6a6d415 Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE 2011-05-02 11:49:46 -07:00
Robert Greenwalt
aa70f101e0 Add RouteInfo objects for tracking routes. 
Used to have list of gateways for default routes, but general static routes
should be supported.

Change-Id: I01730142c6139f2b833b9d48f5381d2d320b69f6
 2011-05-02 11:17:30 -07:00
Wink Saville
0246bbc8d7 Enhance AsyncChannel. 
- Use  Protocol for BASE of CMD's.
- Add synchronous connect methods.
- Back port sha1 c23971b3e4f92ac31996d4f9f32eef3cb4ef65fd from master

Change-Id: If0b3f6cbbb8d4268cad6ca19d26ab2ee42390d86
 2011-05-02 10:44:56 -07:00
Conley Owens
9c4ba2580e Merge "Removing dead store; it was likely a relict of debuging code." 2011-05-02 09:53:25 -07:00
Irfan Sheriff
31be7cf4c7 Add DhcpStateMachine for interation with dhcpcd 
- Supports wakeup and renewal on dhcp
- Supports multiple controllers to use the state machine
  simultaneously
- Optionally, a controller can request a notification prior
  to DHCP request/renewal being sent

Change-Id: I3a9d7e6a02ff26be3a86ddca6964683ad3c28f93
 2011-04-30 12:58:51 -07:00
Conley Owens
a3dcd0a3f1 Merged "Adjust mBiggerTouchSlopSquare to the suitable value" 
Conflicts:
	core/java/android/view/ViewConfiguration.java

Change-Id: I74de006dbb19fd878591bc90955a1c6e74aa084e
 2011-04-29 17:49:06 -07:00
Conley Owens
dddaa56f79 Merge commit 'b737647d' (Scrolling using arrow keys with padding) into m 
Conflicts:
	core/java/android/widget/ScrollView.java

Change-Id: I1cfd3f7091e92793ce9fa048a09ae08a04c10c80
 2011-04-29 17:35:29 -07:00
Conley Owens
f395e3042a am 19653c64: am 425db473: Merge "CHAR_SEQUENCE_CREATOR cannot handle null string" 
* commit '19653c6440eaf7328ecbc01c3ca6d7a910906484':
  CHAR_SEQUENCE_CREATOR cannot handle null string
 2011-04-29 17:15:39 -07:00
Conley Owens
1eb31b434f am 718516f3: am 9fd8e057: Merge "Fix memory leak of SkMovie class" 
* commit '718516f3b73468c480ef8d2283a1c80a6223658d':
  Fix memory leak of SkMovie class
 2011-04-29 17:15:09 -07:00
Conley Owens
c30d767628 am 1a846ab0: am b1578d85: Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > 
* commit '1a846ab089878a6b342c6bc3e8850fc2e0ef3080':
  Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal > Press search key > Touch list item or press back key > ANR popup is shown
 2011-04-29 17:07:14 -07:00
Conley Owens
5eb49e0f1e am e321d064: am 2f463ef1: Merge "Adding a sanity test in the while loop in readHistory()" 
* commit 'e321d06430304fa93282c765aa6070c908121a16':
  Adding a sanity test in the while loop in readHistory()
 2011-04-29 16:44:14 -07:00
Scott Main
75c78dc364 am 511ec082: am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb 
* commit '511ec082bb198cfd04aebdccf56db6f4c8df9523':
  docs: more documentation for ProgressBar
 2011-04-29 15:05:10 -07:00
Scott Main
511ec082bb am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb 
* commit 'de506220d8a3d453463e1abe1b2eb54afd48ec93':
  docs: more documentation for ProgressBar
 2011-04-29 14:59:08 -07:00
Conley Owens
c703b49eb1 am 54668b8a: am e1787009: Merge "Added null check on return value for getKeyDispatcherState()" 
* commit '54668b8a3599559fc007af1d75c039400a05e898':
  Added null check on return value for getKeyDispatcherState()
 2011-04-29 14:57:53 -07:00