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

59673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gloria Wang
043dd2e6b4 am 7eaedf93: (-s ours) am 62c24d7b: (-s ours) Merge "Cherry-pick from master. Do not merge. Do not need to reset surface as NULL in MediaPlayer\'s _release. Related to bug 5252296." into ics-factoryrom 
* commit '7eaedf93ca8e46d0360e6d904abf38d969daa3f1':
  Cherry-pick from master. Do not merge. Do not need to reset surface as NULL in MediaPlayer's _release. Related to bug 5252296.
 2011-09-15 17:42:58 -07:00
Gloria Wang
7eaedf93ca am 62c24d7b: (-s ours) Merge "Cherry-pick from master. Do not merge. Do not need to reset surface as NULL in MediaPlayer\'s _release. Related to bug 5252296." into ics-factoryrom 
* commit '62c24d7bfa5a88655ba9981dba2a565c1136a255':
  Cherry-pick from master. Do not merge. Do not need to reset surface as NULL in MediaPlayer's _release. Related to bug 5252296.
 2011-09-15 17:38:36 -07:00
Dianne Hackborn
59153f31c7 am 5adea623: Merge "Fix issue #5300880: setSystemUiVisibility() always triggers a surface reallocation" 
* commit '5adea623ee62d811a7772fcd7a6dcea223d0c00d':
  Fix issue #5300880: setSystemUiVisibility() always triggers a surface reallocation
 2011-09-15 17:11:39 -07:00
Dianne Hackborn
39fd754863 am b59d270d: Merge "Fix issue #5317970: Removing active wallpaper from manifest crashes phone" 
* commit 'b59d270df74b6be49ea6a1ae2155e3deeb0f74d7':
  Fix issue #5317970: Removing active wallpaper from manifest crashes phone
 2011-09-15 17:11:35 -07:00
Dianne Hackborn
5adea623ee Merge "Fix issue #5300880: setSystemUiVisibility() always triggers a surface reallocation" 2011-09-15 17:09:01 -07:00
Dianne Hackborn
b59d270df7 Merge "Fix issue #5317970: Removing active wallpaper from manifest crashes phone" 2011-09-15 17:08:07 -07:00
Gloria Wang
62c24d7bfa Merge "Cherry-pick from master. Do not merge. Do not need to reset surface as NULL in MediaPlayer's _release. Related to bug 5252296." into ics-factoryrom 2011-09-15 17:04:02 -07:00
Gloria Wang
3919e04e4b am 152f7b39: Merge "If media player has died already, do not dec the old surface texture reference. Otherwise segfault will occur. For bug 5327664." 
* commit '152f7b3985a777403168722891b7941c16a0cfaa':
  If media player has died already, do not dec the old surface texture reference. Otherwise segfault will occur. For bug 5327664.
 2011-09-15 16:58:02 -07:00
Gloria Wang
152f7b3985 Merge "If media player has died already, do not dec the old surface texture reference. Otherwise segfault will occur. For bug 5327664." 2011-09-15 16:56:41 -07:00
Christopher Tate
cf0b924ab9 am b851f15e: Merge "Don\'t do full backup/restore before setup" 
* commit 'b851f15ee22222569bfbda1a017c12dcc89ec3ab':
  Don't do full backup/restore before setup
 2011-09-15 16:49:52 -07:00
Christopher Tate
b851f15ee2 Merge "Don't do full backup/restore before setup" 2011-09-15 16:48:42 -07:00
Fred Quintana
9d286aaf9a am 569584be: Merge "Add a generic account chooser/add account flow for apps." 
* commit '569584be0e51ca6aceb53aa81b5ecac23d1ca55b':
  Add a generic account chooser/add account flow for apps.
 2011-09-15 16:47:52 -07:00
Fred Quintana
569584be0e Merge "Add a generic account chooser/add account flow for apps." 2011-09-15 16:44:53 -07:00
Fred Quintana
89e063113c Add a generic account chooser/add account flow for apps. 
The activity is launched as follows:
  Account account1 = new Account("account1@gmail.com", "com.google")
  Account account2 = new Account("account2@gmail.com", "com.google")
  ArrayList<Account> accounts = new ArrayList<Account>();
  accounts.add(account1);
  accounts.add(account2);
  String[] accountTypes = new String[]{"com.google", "com.android.exchange"};
  Bundle addAccountOptions = null;
  Intent intent = AccountManager.newChooseAccountIntent(account1, accounts,
    accountTypes, addAccountOptions);
  startActivityForResult(intent, 0);

Change-Id: I05a467bdc3552a2e39397b0182879351f4324389
 2011-09-15 16:39:50 -07:00
Ed Heyl
0e43b70546 am cb1610c8: Merge branch \'master\' of ssh://android-git:29418/platform/frameworks/base 
* commit 'cb1610c82b3a715ab96da4bd697b0ed5cda21093':
 2011-09-15 16:24:12 -07:00
John Reck
a64997eb4a am 68901a3e: (-s ours) Merge "DO NOT MERGE Fix finalization" into ics-factoryrom 
* commit '68901a3e8157db32c02386415caf0ecc9ef47c03':
  DO NOT MERGE Fix finalization
 2011-09-15 16:24:09 -07:00
duckyoung.chai
26b14d3c3e am 80c32a37: [toro] Add telephonyManager API ( getMsisdnNumber() ) for IMS Module. 
* commit '80c32a37b63ceff885199e22a8505ac557c86d35':
  [toro] Add telephonyManager API ( getMsisdnNumber() ) for IMS Module.
 2011-09-15 16:24:05 -07:00
Ed Heyl
cb1610c82b Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-09-15 16:18:27 -07:00
Christopher Tate
d2c0cd4313 Don't do full backup/restore before setup 
On the restore side, there's a bunch of one-time setup, device
provisioning, etc that we're very much not prepared to do in
lieu of running setup wizard, at least at this time.

On the backup side, it simply doesn't make sense to back up
stuff before the device has been set up.

Part of bug 5290261

Change-Id: If1c65e88e2da589d6204232d2b59c3e994f4ed3f
 2011-09-15 15:51:29 -07:00
Gloria Wang
e828beb386 If media player has died already, do not dec the old surface texture reference. 
Otherwise segfault will occur.
For bug 5327664.

Change-Id: I03ea7bc047aa99a106f1e010dac74f75a833ef84
 2011-09-15 15:36:02 -07:00
Dianne Hackborn
4f59f8be0e Fix issue #5300880: setSystemUiVisibility() always triggers a surface reallocation 
Change-Id: Ia0a9d8acba6b62ef095e4c615099466c52eec8e4
 2011-09-15 15:27:59 -07:00
Dianne Hackborn
80b902ffbe Fix issue #5317970: Removing active wallpaper from manifest crashes phone 
Clean up a bunch of stuff about dealing with failures in applying
the wallpaper.

Change-Id: Ib0c7ec6cc00936dd00c752991be068dc75fc24c9
 2011-09-15 15:15:27 -07:00
Adam Powell
833cf5c8c1 am 1451f182: Merge "Update docs for RelativeLayout to better explain its interpretation of gravity." 
* commit '1451f1821d4842ae9c5d3d4c6b5dab82048c0676':
  Update docs for RelativeLayout to better explain its interpretation of gravity.
 2011-09-15 15:05:02 -07:00
Adam Powell
1451f1821d Merge "Update docs for RelativeLayout to better explain its interpretation of gravity." 2011-09-15 15:02:55 -07:00
Jason Simmons
4d4f6beeb5 Merge "Ensure that the TRTP retry buffer has contiguous sequence numbers" into ics-aah 2011-09-15 15:01:17 -07:00
Gilles Debunne
b9532200bd am a0383f72: Merge "Bug 5319091: Completions delayed in AutoComplete in landscape" 
* commit 'a0383f7212651c9508ad5fb56b1cd1216ceb8fe9':
  Bug 5319091: Completions delayed in AutoComplete in landscape
 2011-09-15 14:53:57 -07:00
Gilles Debunne
a0383f7212 Merge "Bug 5319091: Completions delayed in AutoComplete in landscape" 2011-09-15 14:51:35 -07:00
Adam Powell
1fec24e0ff Update docs for RelativeLayout to better explain its interpretation of 
gravity.

Change-Id: Ie52dc23458c73dfb7fdbf929b802f968ef905557
 2011-09-15 14:49:19 -07:00
Ashish Sharma
3ec5415c59 am 2e4a560f: Merge "Add packet counts to uid and iface stats. Needed to add Ethernet overhead to uid_stats (IP level) to compare with interface stats (Ethernet level)." 
* commit '2e4a560f294cd8bb278335c3053d5d1d34918214':
  Add packet counts to uid and iface stats. Needed to add Ethernet overhead to uid_stats (IP level) to compare with interface stats (Ethernet level).
 2011-09-15 14:43:15 -07:00
Ashish Sharma
2e4a560f29 Merge "Add packet counts to uid and iface stats. Needed to add Ethernet overhead to uid_stats (IP level) to compare with interface stats (Ethernet level)." 2011-09-15 14:30:40 -07:00
Jason Simmons
e02d5d5348 Ensure that the TRTP retry buffer has contiguous sequence numbers 
Previously, sequence numbers for audio packets were assigned by the
TX player before packets were queued to the sender.  This caused a
race between assignment of sequence numbers on audio packets and
sequence numbers on heartbeat packets.  A heartbeat could get queued
and added to the retry buffer before an audio packet with an earlier
sequence number got queued.

This CL centralizes packet sequence number assignment and insertion
into the retry buffer inside AAH_TXSender::doSendPacket_l.  It also
makes explicit what operations can be done on a TRTPPacket before
and after packing.

Change-Id: If90ca25947d33df486ccedbb3f38e624618eb906
 2011-09-15 14:27:56 -07:00
Svetoslav Ganov
1f711d7342 am 98c8b52b: Merge "TextView should report in an AccessibilityNodeInfo\'s text its hint if the View text is empty." 
* commit '98c8b52b0ac7c108b03a5e73c1dcfb94a0a69868':
  TextView should report in an AccessibilityNodeInfo's text its hint if the View text is empty.
 2011-09-15 13:26:36 -07:00
Svetoslav Ganov
3034943233 am 4c949365: Merge "CalendarView diregarding XML attributes." 
* commit '4c94936511a1c045f53c9207dc9908f5c89b56e5':
  CalendarView diregarding XML attributes.
 2011-09-15 13:26:33 -07:00
Daniel Sandler
7b0c83f9d1 am c76a651f: Merge "Fix MENU icon weirdness." 
* commit 'c76a651f6bec8ea13666ef53de33a1da4e80de5b':
  Fix MENU icon weirdness.
 2011-09-15 13:26:30 -07:00
Gilles Debunne
4b37973b61 am 0fd7e087: Merge "Bug 5299484: Recipient address in to field is doubled when entering in landscape mode" 
* commit '0fd7e087eb95ff3d41e7170e6a093f7d31c6b6d8':
  Bug 5299484: Recipient address in to field is doubled when entering in landscape mode
 2011-09-15 13:26:21 -07:00
Svetoslav Ganov
98c8b52b0a Merge "TextView should report in an AccessibilityNodeInfo's text its hint if the View text is empty." 2011-09-15 13:11:44 -07:00
Svetoslav Ganov
4c94936511 Merge "CalendarView diregarding XML attributes." 2011-09-15 13:11:08 -07:00
Daniel Sandler
c76a651f6b Merge "Fix MENU icon weirdness." 2011-09-15 13:09:29 -07:00
Daniel Sandler
56598cd4d3 Fix MENU icon weirdness. 
(Broken by change I7cbb7bbf.)

Bug: 5308636
Change-Id: I30ca20f62bd140a823eb926a9a0521c4d6014680
 2011-09-15 16:08:45 -04:00
Gilles Debunne
0fd7e087eb Merge "Bug 5299484: Recipient address in to field is doubled when entering in landscape mode" 2011-09-15 12:43:51 -07:00
Ashish Sharma
baf4c85723 Add packet counts to uid and iface stats. 
Needed to add Ethernet overhead to uid_stats (IP level)
to compare with interface stats (Ethernet level).

Change-Id: Ia6324c21a868eea5ad3b67f546c9d10c7fb64172
 2011-09-15 12:20:27 -07:00
Danielle Millett
86c32c0247 am 247d8b08: Merge "isPasswordEnabled and isPatternEnabled return true if used as backup method" 
* commit '247d8b08b2618c33a4ec1be974829c033c9b909f':
  isPasswordEnabled and isPatternEnabled return true if used as backup method
 2011-09-15 12:16:45 -07:00
Danielle Millett
247d8b08b2 Merge "isPasswordEnabled and isPatternEnabled return true if used as backup method" 2011-09-15 12:14:25 -07:00
Gloria Wang
c286b2cc26 Cherry-pick from master. Do not merge. 
Do not need to reset surface as NULL in MediaPlayer's _release.
Related to bug 5252296.

Change-Id: Ieab063cee70e072fcc4d861abe0f7979a7bab1ec
 2011-09-15 11:58:25 -07:00
John Reck
68901a3e81 Merge "DO NOT MERGE Fix finalization" into ics-factoryrom 2011-09-15 11:49:00 -07:00
Svetoslav Ganov
ab5a4057e7 TextView should report in an AccessibilityNodeInfo's text its hint if the View text is empty. 
1. TextView was reporting only its text as the text of the emmited AccessibilityNodeInfo
   not using the hint if the text is empty which is inconsistent with the handling of
   accessibility events.

2. TextView was using the contentDescription in AccessibilityEvents if its
   text and hint are empyty. However, the content description is reported as
   a separate event property and it is incorrect to report it as the text.

bug:5129138

Change-Id: I1c9270459cb07650a0ec5181cc4a01993dde3b5c
 2011-09-15 11:30:06 -07:00
Svetoslav Ganov
f1189e9a46 CalendarView diregarding XML attributes. 
1. CalendarView was disregarding XMl attributes.

2. CalendarView was trying to set the current date
   to today without checking where today is between
   min and max date.

bug:5116456

Change-Id: Ie5a81826a3cd028f42e18a7985461fa283839171
 2011-09-15 11:26:08 -07:00
duckyoung.chai
80c32a37b6 [toro] Add telephonyManager API ( getMsisdnNumber() ) for IMS Module. 
IMS Module need the MSISDN value for IMS registration.(VZW Requirement)

Change-Id: I8713b6c55788276246ee1c2f91eaf2d3ab8cc813
Signed-off-by: duckyoung.chai <duckyoung.chai@samsung.com>
 2011-09-15 11:10:12 -07:00
Jamie Gennis
60951ba027 am 6ba3ff72: Merge "SurfaceFlinger: fix isOpaque check in lockPageFlip" 
* commit '6ba3ff724b73afe3de4d01d57656273e6fead1e0':
  SurfaceFlinger: fix isOpaque check in lockPageFlip
 2011-09-15 11:08:12 -07:00
John Reck
5540abcdef DO NOT MERGE Fix finalization 
Bug: 5321358
 Destroy does run with this. Ideally we should get rid of the need
 to run this on the UI thread at all. GL destroy should instead
 take place when the view is detached or something like that.

 Cherry picked from master

Change-Id: I693ce83cd607186173d8cf58485c5df28004e52c
 2011-09-15 11:08:00 -07:00