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

48872 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wu-cheng Li
e98e4c8063 Add camera metering area API. 
The API are still hidden.

bug:3475893
Change-Id: Id4147528def5e0fe067e1a3ed315fa34c14a0640
 2011-04-13 16:06:47 +08:00
Wink Saville
a58ee55f49 am 6e797566: am 442b08bc: Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE 
* commit '6e797566650c10ba8655aea914d521f5999073e8':
  Cleanup all functions overridden from DCT in GDCT
 2011-04-09 08:05:31 -07:00
Wink Saville
6e79756665 am 442b08bc: Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE 
* commit '442b08bc7c934f601a111bf97ea96842d69cdc23':
  Cleanup all functions overridden from DCT in GDCT
 2011-04-09 07:57:35 -07:00
Wink Saville
442b08bc7c Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE 2011-04-09 07:50:37 -07:00
Elliott Hughes
7797e647fc Merge "Tidy up exception throwing in the media native code." 2011-04-08 18:37:01 -07:00
Dianne Hackborn
bcbab36843 Merge "Rework thumbnails in activity manager." 2011-04-08 18:28:14 -07:00
Dianne Hackborn
f26fd99a7c Rework thumbnails in activity manager. 
We now only keep a thumbnail for the task, not for each
activity.  However if you use FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET,
we will make a new secondary thumbnail for that series of
activities.  There is a new API for the app to get these
secondary thumbnails.

Also set a default thumbnail size for non-xlarge screens
so we have thumbnails on phones.  (We need some smarter
code in the platform for computing the actual thumbnail
dimensions of the current device).  And add a test app
to show recent tasks + thumbnails.

Change-Id: Ic36759f6635522118a2cb7f156662229a610c492
 2011-04-08 18:16:21 -07:00
Jamie Gennis
0741b1ae22 am 0fb4e73f: am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow. 
* commit '0fb4e73f5fd107b0ebd1c7a1a25dc40d99cf0705':
  Stagefright: authenticate ANativeWindow.
 2011-04-08 17:43:33 -07:00
Elliott Hughes
15dd15fd57 Tidy up exception throwing in the media native code. 
(I'm going through all of frameworks/base in multiple passes. This pass is just
for exception throwing.)

Change-Id: Ia14a5c720edae86ac780023be88e676aa1b3315d
 2011-04-08 17:42:34 -07:00
Jamie Gennis
0fb4e73f5f am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow. 
* commit '3a9f5143efe63b4b94a1bd1312e0ba618a58674f':
  Stagefright: authenticate ANativeWindow.
 2011-04-08 17:41:38 -07:00
Jamie Gennis
3a9f5143ef am 66380f76: Stagefright: authenticate ANativeWindow. 
* commit '66380f768c0de8bde1f54ac6ab3f126b66928dad':
  Stagefright: authenticate ANativeWindow.
 2011-04-08 17:40:00 -07:00
Robert Greenwalt
862da792c0 Cleanup all functions overridden from DCT in GDCT 
Also removed use of iterator.

Change-Id: I58e505d641cc2b84b6522a6793665c2a3c839580
 2011-04-08 17:36:39 -07:00
Robert Greenwalt
6cab9a6e3f am da2790fa: am 658779f5: Merge "Make ApnSettings threadsafe." into honeycomb-LTE 
* commit 'da2790fa0adc187440c35261256c9989ca1b6ed8':
  Make ApnSettings threadsafe.
 2011-04-08 17:23:50 -07:00
Robert Greenwalt
da2790fa0a am 658779f5: Merge "Make ApnSettings threadsafe." into honeycomb-LTE 
* commit '658779f5d81031dc2c34ef6bc374fad394d01465':
  Make ApnSettings threadsafe.
 2011-04-08 17:21:43 -07:00
Robert Greenwalt
658779f5d8 Merge "Make ApnSettings threadsafe." into honeycomb-LTE 2011-04-08 17:19:53 -07:00
Joe Onorato
d7c5e99c9b Merge "Use the new API file format, and some minor tweaks to the old XML files that make the parser easier." 2011-04-08 17:10:57 -07:00
Robert Greenwalt
561538879b Make ApnSettings threadsafe. 
Also fixes getActiveApnString.

Change-Id: I2278b30505cc8a6be484341cba12d14f7b6316e8
 2011-04-08 16:48:42 -07:00
Robert Greenwalt
2270d05698 am ede9ed9f: am 1eeeae59: Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE 
* commit 'ede9ed9f704979a373b6b8676373611409cff92f':
  Fix getActiveApnTypes for GsmDCT.
 2011-04-08 16:44:42 -07:00
Robert Greenwalt
9e1e1360d3 am de78352c: am ac9c73ae: Merge "Fix notification of disconnected networks." into honeycomb-LTE 
* commit 'de78352c6c048e009fbeefb40a2b06a8573f7b7e':
  Fix notification of disconnected networks.
 2011-04-08 16:44:32 -07:00
Robert Greenwalt
ede9ed9f70 am 1eeeae59: Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE 
* commit '1eeeae59d07ccc6b7db865b942d3e0b9394b1a59':
  Fix getActiveApnTypes for GsmDCT.
 2011-04-08 16:38:39 -07:00
Robert Greenwalt
de78352c6c am ac9c73ae: Merge "Fix notification of disconnected networks." into honeycomb-LTE 
* commit 'ac9c73ae619aee63f49cf1f845ef5588bd46dce8':
  Fix notification of disconnected networks.
 2011-04-08 16:38:34 -07:00
Robert Greenwalt
1eeeae59d0 Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE 2011-04-08 16:31:03 -07:00
Robert Greenwalt
ac9c73ae61 Merge "Fix notification of disconnected networks." into honeycomb-LTE 2011-04-08 16:22:06 -07:00
Joe Onorato
5e88ac73ce Use the new API file format, and some minor tweaks to the old XML files that make the parser easier. 
Change-Id: I9307d0d323f1b65816b3e097bf9c4d92f3962b2f
 2011-04-08 16:21:34 -07:00
Elliott Hughes
dcd2ef9acc Merge "More JNI exception-throwing cleanup." 2011-04-08 16:15:26 -07:00
Robert Greenwalt
1b6c758c29 Fix getActiveApnTypes for GsmDCT. 
Change-Id: I42e71f0cbe31289f16623de38141213f547aa13f
 2011-04-08 16:07:37 -07:00
Robert Greenwalt
6b01e4cdf8 Fix notification of disconnected networks. 
Reorder - set state and then report the state, else we always report disconnecting which
is interpreted as still connected.

Change-Id: I95f5fe9ccee0d7ee9a03f78ae5b614af2ba0860b
 2011-04-08 15:52:23 -07:00
Brian Carlstrom
8d387d6cad Merge "Add keychain user with special keystore access permissions" 2011-04-08 15:40:06 -07:00
Wink Saville
d5226cff8d am 4a28096d: am 73ad388a: Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE 
* commit '4a28096dec16666d9425cb8e23641985f963a4f3':
  Check different CellLocation type in GsmDataConnectionTracker
 2011-04-08 15:31:24 -07:00
Robert Greenwalt
f034932be6 am 01f8f290: am 63edf6c4: Rename PhoneBase\'s DataConnectionTracker member. 
* commit '01f8f290cd2c01c7ed9a1966f39fa74032352dc8':
  Rename PhoneBase's DataConnectionTracker member.
 2011-04-08 15:31:21 -07:00
Wink Saville
e92e469751 Merge "resolved conflicts for merge of 4b1a37d7 to master" 2011-04-08 15:25:14 -07:00
Jamie Gennis
66380f768c Stagefright: authenticate ANativeWindow. 
This change adds a check to verify that the ANativeWindow to which
decoded video buffers are queued sends those buffers to SurfaceFlinger.
The check is done when the buffer content is flagged as protected.  This
change also adds an error in the case where protected buffers are
needed, but an ANativeWindow is not being used as the video destination.

Change-Id: I107c9082d65ef0de4a13594e9535a2053ad5161b
Bug: 4269240
 2011-04-08 15:24:10 -07:00
Elliott Hughes
69a017bc1d More JNI exception-throwing cleanup. 
There are a few (unimportant) bug fixes here. There were several attempts to
throw exceptions in situations where there's already a pending exception.

There were also cases where the code was wrong; it was checking for a NULL
return from Get*ArrayElements and throwing NPE, but passing NULL is an error
that causes a crash and a NULL return means an exception has already been
thrown. I didn't want to get into the Scoped* classes just yet, but that
was by far the easiest way to fix this.

Change-Id: I0b31160ee51b96e82539f6514b8412b149dba7c3
 2011-04-08 15:01:19 -07:00
Wink Saville
de56db46c4 resolved conflicts for merge of 4b1a37d7 to master 
Change-Id: I872f40b0e0de534a37e3cf6bdc4d175b66226188
 2011-04-08 14:57:51 -07:00
Fabrice Di Meglio
0343a7eb6d Merge "TextLayoutCache - add glyphs caching" 2011-04-08 14:51:08 -07:00
Fabrice Di Meglio
fcf2be1846 TextLayoutCache - add glyphs caching 
- cache glyphs after Harfbuzz shaping
- use "m" prefix for member variables
- add temporary API for drawing text with glyphs
- update BiDiTest app

Change-Id: I619b3f313b15f010018daad21b3e5e486619b4e4
 2011-04-08 14:37:18 -07:00
Brian Carlstrom
8c2a1a90a8 Add keychain user with special keystore access permissions 
Change-Id: I02fe5171add62c5cd9f57b01bc137f3bc1cb3a69
 2011-04-08 14:06:39 -07:00
Wink Saville
4a28096dec am 73ad388a: Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE 
* commit '73ad388aae28213dd3f47bcac1b52c671e3cacc7':
  Check different CellLocation type in GsmDataConnectionTracker
 2011-04-08 13:23:24 -07:00
Wink Saville
73ad388aae Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE 2011-04-08 13:20:20 -07:00
Robert Greenwalt
01f8f290cd am 63edf6c4: Rename PhoneBase\'s DataConnectionTracker member. 
* commit '63edf6c4f5795009e55f2ae9556550c38daa9774':
  Rename PhoneBase's DataConnectionTracker member.
 2011-04-08 12:23:49 -07:00
Robert Greenwalt
63edf6c4f5 Rename PhoneBase's DataConnectionTracker member. 
Was called mDataConnection, but this is more confusing now that we have multiple
DataConnections.  Changed it to the more correct mDataConnectionTracker.

Change-Id: I3cdc4f2897d60e5b0885891744aa6ff2db27af37
 2011-04-08 11:54:01 -07:00
Kazuhiro Ondo
8968f9f6d4 Check different CellLocation type in GsmDataConnectionTracker 
Addressing phone app crash in GsmDataConnectionTracker when CDMALTEPhone
is used. CDMALTEPhone uses CDMA SST so getCellLocation() was returning
an instance of CdmaCellLocation. This was causing a crash when GsmDCT
type casts the instance as GsmCellLocation.

This patch tries to check the instance type before retrieving corresponding
cell id.

Change-Id: I6ac9cd4dc078552dc58d4d9350494a7b608c2b98
 2011-04-08 11:42:51 -07:00
Wink Saville
4b1a37d725 am 5203a5bc: Cleanup debugging. 
* commit '5203a5bc28a5ae432eab236780b2f97bdec71dbf':
  Cleanup debugging.
 2011-04-08 11:35:11 -07:00
Wink Saville
5203a5bc28 Cleanup debugging. 
Change-Id: I4c61b6716a6d03d70bc1e9013954d6b2002cec54
 2011-04-08 11:14:23 -07:00
Wink Saville
5008e92d1f am b9381109: am 1905e166: Merge "DataConnection: set CID to the correct value." into honeycomb-LTE 
* commit 'b93811091d8e412d1247ee1f4506b7db1439235d':
  DataConnection: set CID to the correct value.
 2011-04-08 10:44:43 -07:00
Wink Saville
b93811091d am 1905e166: Merge "DataConnection: set CID to the correct value." into honeycomb-LTE 
* commit '1905e166ed40ee11e80476848ef40e817512f740':
  DataConnection: set CID to the correct value.
 2011-04-08 10:41:09 -07:00
Wink Saville
1905e166ed Merge "DataConnection: set CID to the correct value." into honeycomb-LTE 2011-04-08 10:38:25 -07:00
Brian Carlstrom
ceb889711f Merge "Tolerate missing AccountManager resource, not just missing resource name" 2011-04-08 10:28:34 -07:00
Robert Greenwalt
c9fb9888ce am 2ce73e77: am 9c7f433c: Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE 
* commit '2ce73e77c99effb9521db15c882529ccbafd57a6':
  Fix isApnTypeActive in GDCT.
 2011-04-08 10:11:43 -07:00
Robert Greenwalt
2ce73e77c9 am 9c7f433c: Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE 
* commit '9c7f433c80fd2014562f8d161e6a34710fe475d6':
  Fix isApnTypeActive in GDCT.
 2011-04-08 10:09:03 -07:00