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

25721 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
8bb998d52c am ea8eafad: am 2529a453: Merge "Make bad notifications crash their application." into gingerbread 
Merge commit 'ea8eafad4f5438ec1291d45376959a996d36e15e'

* commit 'ea8eafad4f5438ec1291d45376959a996d36e15e':
  Make bad notifications crash their application.
 2010-06-24 17:33:14 -07:00
Dianne Hackborn
ea8eafad4f am 2529a453: Merge "Make bad notifications crash their application." into gingerbread 
Merge commit '2529a45339b7e02d9d2b813358bcecd144a971ea' into gingerbread-plus-aosp

* commit '2529a45339b7e02d9d2b813358bcecd144a971ea':
  Make bad notifications crash their application.
 2010-06-24 17:30:42 -07:00
Dianne Hackborn
2529a45339 Merge "Make bad notifications crash their application." into gingerbread 2010-06-24 17:28:13 -07:00
Dianne Hackborn
9d39d0cb36 Make bad notifications crash their application. 
Implement notification manager handling of bad notifications, to
call a new activity manager to have the owner's process crashed
(if there is one).

Change-Id: Ib15e8d0c598756f3b39c99cc2045c18e054daf6b
 2010-06-24 17:27:28 -07:00
Dianne Hackborn
7acbc1f1e7 am cac3126c: am 5340bffd: am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo 
Merge commit 'cac3126c6109854640266c4807e5aa8e6a87142f'

* commit 'cac3126c6109854640266c4807e5aa8e6a87142f':
  Properly note the current active restore set's token
 2010-06-24 17:16:37 -07:00
Dianne Hackborn
36e5f667bc resolved conflicts for merge of 2eb12a47 to master 
Change-Id: I79eb9d9f083e51ec1b99145d81632683669e7a99
 2010-06-24 16:29:54 -07:00
Dianne Hackborn
cac3126c61 am 5340bffd: am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo 
Merge commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961' into gingerbread-plus-aosp

* commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961':
  Properly note the current active restore set's token
 2010-06-24 16:04:07 -07:00
Dianne Hackborn
5340bffd8b am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo 
Merge commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6' into gingerbread

* commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6':
  Properly note the current active restore set's token
 2010-06-24 16:01:39 -07:00
Dianne Hackborn
5827d3eaf3 Merge "Properly note the current active restore set's token" into froyo 2010-06-24 16:00:06 -07:00
Christopher Tate
2950555aac Properly note the current active restore set's token 
Bug: 2796780
Change-Id: Iad601ed96ae73cf34910a276350712e6af19bb4e
 2010-06-24 15:58:01 -07:00
Dianne Hackborn
2eb12a4722 am 01e4cfc4: Some ActivityThread/ActivityManager cleanup. 
Merge commit '01e4cfc47d0a2c7e7ab383d2fb23224ec52c0301' into gingerbread-plus-aosp

* commit '01e4cfc47d0a2c7e7ab383d2fb23224ec52c0301':
  Some ActivityThread/ActivityManager cleanup.
 2010-06-24 15:23:59 -07:00
Dianne Hackborn
01e4cfc47d Some ActivityThread/ActivityManager cleanup. 
- Move PackageInfo out of ActivityThread, renaming to LoadedApk.
- Rename some of the other PacakgeInfo inner classes to better
  represent what they are.
- Rename HistoryRecord to ActivityRecord.
- Introduce AppGlobals, to eventually let ActivityThread become
  package scoped.

Change-Id: Ib714c54ceb3cdbb525dce3db9505f31042e88cf0
 2010-06-24 15:20:48 -07:00
Jason Sams
8f31bd6b68 Merge "Add matrix ops to RSH headers." 2010-06-24 14:51:28 -07:00
Jason Sams
fae3f6b415 Add matrix ops to RSH headers. 
Change-Id: I7e2843983a12e0155114b4a18813799e4341d26f
 2010-06-24 13:54:11 -07:00
Gilles Debunne
b6ca723142 Fixed bug 2795971 IME doesn't appear on touching a text field 
Refactoring in CL 55138 added an extra condition to display the IME.

Change-Id: I2a4cc83bb39bd2c87ad3bd75ef234cdbdfdad74f
 2010-06-24 13:42:34 -07:00
Andreas Huber
3fef4f5a0a am 95d26de9: am 7b5b27ad: Merge "Properly identify malformed (too short) chunks in mpeg4 files." into gingerbread 
Merge commit '95d26de9e048ef0342e3aed15a4d5d5c8a6e8493'

* commit '95d26de9e048ef0342e3aed15a4d5d5c8a6e8493':
  Properly identify malformed (too short) chunks in mpeg4 files.
 2010-06-24 13:18:12 -07:00
Andreas Huber
95d26de9e0 am 7b5b27ad: Merge "Properly identify malformed (too short) chunks in mpeg4 files." into gingerbread 
Merge commit '7b5b27ada12d3680dec20274fa655fd7f73f839e' into gingerbread-plus-aosp

* commit '7b5b27ada12d3680dec20274fa655fd7f73f839e':
  Properly identify malformed (too short) chunks in mpeg4 files.
 2010-06-24 13:16:47 -07:00
Andreas Huber
7b5b27ada1 Merge "Properly identify malformed (too short) chunks in mpeg4 files." into gingerbread 2010-06-24 13:14:38 -07:00
Dianne Hackborn
5eceb79a19 am 82677b95: am e57c3a88: Merge "Add APIs for finding heavy-weight apps." into gingerbread 
Merge commit '82677b9585968806800abff65c5b1529f509a313'

* commit '82677b9585968806800abff65c5b1529f509a313':
  Add APIs for finding heavy-weight apps.
 2010-06-24 12:46:31 -07:00
Dianne Hackborn
82677b9585 am e57c3a88: Merge "Add APIs for finding heavy-weight apps." into gingerbread 
Merge commit 'e57c3a88b99856d1e69fdf115e7c7954594b7385' into gingerbread-plus-aosp

* commit 'e57c3a88b99856d1e69fdf115e7c7954594b7385':
  Add APIs for finding heavy-weight apps.
 2010-06-24 12:42:55 -07:00
Dianne Hackborn
e57c3a88b9 Merge "Add APIs for finding heavy-weight apps." into gingerbread 2010-06-24 12:41:01 -07:00
Nick Pelly
d8a86f0724 am db1bae9a: am 9bf39efb: Do not log AT command traffic by default. 
Merge commit 'db1bae9a966150d7f6cc7d3e325cc8a4bf64b978'

* commit 'db1bae9a966150d7f6cc7d3e325cc8a4bf64b978':
  Do not log AT command traffic by default.
 2010-06-24 12:29:06 -07:00
Nick Pelly
db1bae9a96 am 9bf39efb: Do not log AT command traffic by default. 
Merge commit '9bf39efb1b8527d7c46b20538cbb75bd60900b44' into gingerbread-plus-aosp

* commit '9bf39efb1b8527d7c46b20538cbb75bd60900b44':
  Do not log AT command traffic by default.
 2010-06-24 12:27:46 -07:00
Nick Pelly
9bf39efb1b Do not log AT command traffic by default. 
Bug: 2792732
Change-Id: I24cb14c14f49e606f0aef1d05a533b90b3dfff53
 2010-06-24 12:25:42 -07:00
Nick Pelly
b207c687e5 am 3013fe87: am ab04f978: am d19c397b: (-s ours) Merge "Do not log AT command traffic by default." into froyo 
Merge commit '3013fe87fc524cdd788d52cd95dfbe27b2c5d60a'

* commit '3013fe87fc524cdd788d52cd95dfbe27b2c5d60a':
  Do not log AT command traffic by default.
 2010-06-24 12:20:00 -07:00
Nick Pelly
3013fe87fc am ab04f978: am d19c397b: (-s ours) Merge "Do not log AT command traffic by default." into froyo 
Merge commit 'ab04f97855a5097815e8e7b99beb42e9b3bac388' into gingerbread-plus-aosp

* commit 'ab04f97855a5097815e8e7b99beb42e9b3bac388':
  Do not log AT command traffic by default.
 2010-06-24 12:17:25 -07:00
Andreas Huber
736c22d3e0 Properly identify malformed (too short) chunks in mpeg4 files. 
Change-Id: Id2efb1bba195c4ad6f132cd706cc813135ead8a4
 2010-06-24 12:16:25 -07:00
Nick Pelly
ab04f97855 am d19c397b: (-s ours) Merge "Do not log AT command traffic by default." into froyo 
Merge commit 'd19c397b04f485e0af5990f3541e703934869290' into gingerbread

* commit 'd19c397b04f485e0af5990f3541e703934869290':
  Do not log AT command traffic by default.
 2010-06-24 12:15:29 -07:00
Nick Pelly
d19c397b04 Merge "Do not log AT command traffic by default." into froyo 2010-06-24 11:52:39 -07:00
Nick Pelly
801dbe26ee Do not log AT command traffic by default. 
Bug: 2792732
Change-Id: I0ef25f38f38685291af6680cf653046eb391da5a
 2010-06-24 11:48:54 -07:00
Dianne Hackborn
baf42c625c Add APIs for finding heavy-weight apps. 
Change-Id: I6c865cce404cac1a08eee056f963de5d276d5898
 2010-06-24 11:38:47 -07:00
Steve Block
3d9bdc3979 Merge "Add a splash screen to the webruntime." 2010-06-24 10:47:15 -07:00
Ben Murdoch
b5c49c8bb1 Add a splash screen to the webruntime. 
Bug: 2766920
Change-Id: Ie40627aa50e849b49177f79aa129242eb1d2f2a8
 2010-06-24 18:45:34 +01:00
Mike Lockwood
57c798ade1 Add a new UEventObserver subclass to broadcast an Intent whe USB state changes. 
We now broadcast Usb.ACTION_USB_CONNECTED and Usb.ACTION_USB_DISCONNECTED
when USB is connected or disconnected.
The ACTION_USB_CONNECTED extras indicate the enabled/disabled state of
all USB functions.

Change-Id: I919fcd5aa8d640d051cec87053f474a9843ed545
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-06-24 13:14:05 -04:00
James Dong
b6ecd6c923 am 40d9f010: am 7fd22aab: Merge "Fixed the software AAC encoder" into gingerbread 
Merge commit '40d9f0105f0a8f484724619154b18c5d85589eff'

* commit '40d9f0105f0a8f484724619154b18c5d85589eff':
  Fixed the software AAC encoder
 2010-06-24 09:50:11 -07:00
James Dong
40d9f0105f am 7fd22aab: Merge "Fixed the software AAC encoder" into gingerbread 
Merge commit '7fd22aab4506f65b7929ed1030bdd71c56f7db77' into gingerbread-plus-aosp

* commit '7fd22aab4506f65b7929ed1030bdd71c56f7db77':
  Fixed the software AAC encoder
 2010-06-24 09:48:33 -07:00
James Dong
7fd22aab45 Merge "Fixed the software AAC encoder" into gingerbread 2010-06-24 09:46:48 -07:00
Mike Lockwood
d629abd097 am 5da347dd: (-s ours) am 477def1d: Merge changes I11495d03,If5816721 into gingerbread 
Merge commit '5da347dd2dc7de8828077057f4963b904018c5ec'

* commit '5da347dd2dc7de8828077057f4963b904018c5ec':
  Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.
  DO NOT MERGE Add new permission to allow access to USB devices
 2010-06-24 09:31:45 -07:00
Mike Lockwood
5da347dd2d am 477def1d: Merge changes I11495d03,If5816721 into gingerbread 
Merge commit '477def1d4216f82bdfe58525131db88b384fc5a5' into gingerbread-plus-aosp

* commit '477def1d4216f82bdfe58525131db88b384fc5a5':
  Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.
  DO NOT MERGE Add new permission to allow access to USB devices
 2010-06-24 09:28:59 -07:00
Mike Lockwood
477def1d42 Merge changes I11495d03,If5816721 into gingerbread 
* changes:
  Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.
  DO NOT MERGE Add new permission to allow access to USB devices
 2010-06-24 09:26:55 -07:00
Andreas Huber
15149f2ef8 am 0d964c94: am a2549bb6: Merge "Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright." into gingerbread 
Merge commit '0d964c94459e25b9b2221a7c7c789b29f77f15dd'

* commit '0d964c94459e25b9b2221a7c7c789b29f77f15dd':
  Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright.
 2010-06-24 09:08:21 -07:00
Andreas Huber
0d964c9445 am a2549bb6: Merge "Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright." into gingerbread 
Merge commit 'a2549bb644d8ca4b0209d6d2f0c4160521789aa9' into gingerbread-plus-aosp

* commit 'a2549bb644d8ca4b0209d6d2f0c4160521789aa9':
  Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright.
 2010-06-24 09:06:49 -07:00
Andreas Huber
a2549bb644 Merge "Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright." into gingerbread 2010-06-24 09:05:08 -07:00
Mike Lockwood
2423607a32 Add a new UEventObserver subclass to broadcast an Intent whe USB state changes. 
We now broadcast Usb.ACTION_USB_CONNECTED and Usb.ACTION_USB_DISCONNECTED
when USB is connected or disconnected.
The ACTION_USB_CONNECTED extras indicate the enabled/disabled state of
all USB functions.

Change-Id: I11495d039429dbe22bd738067296e39ae415befa
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-06-24 09:36:50 -04:00
Mike Lockwood
9163d42a50 DO NOT MERGE Add new permission to allow access to USB devices 
Adds permission android.permission.ACCESS_USB.
This is a partial cherry pick of a change from master.
It adds the permission, but not the support for associating it
the AID_USB group.

Change-Id: If5816721a4fc88bf444141a7b717da65ea37d5f4
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-06-24 09:36:35 -04:00
Steve Block
abe9e69c45 Merge "Fixes use of permission string in WebRuntimeActivity" 2010-06-24 06:16:15 -07:00
Steve Block
c9eecb274b Fixes use of permission string in WebRuntimeActivity 
Bug: 2766920
Change-Id: I01bc02c99808b31efa34e33754905091b9370b3a
 2010-06-24 10:36:22 +01:00
Joe Onorato
a18dbdf420 am 801b63d3: am 51e895f0: Merge "Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout changed." into gingerbread 
Merge commit '801b63d3b865054b3015e2cf315ca7c9386d1212'

* commit '801b63d3b865054b3015e2cf315ca7c9386d1212':
  Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout
 2010-06-23 17:50:42 -07:00
Romain Guy
038ecb097a Merge "Add support for transformations." 2010-06-23 17:50:02 -07:00
Joe Onorato
801b63d3b8 am 51e895f0: Merge "Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout changed." into gingerbread 
Merge commit '51e895f055f76ad0114a18e1b754a1475a62c524' into gingerbread-plus-aosp

* commit '51e895f055f76ad0114a18e1b754a1475a62c524':
  Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout
 2010-06-23 17:48:18 -07:00