58252 Commits

Author SHA1 Message Date
Gloria Wang
963a7ca0e6 am 91849473: (-s ours) Merge "If media player has died already, do not dec the old surface texture reference. Otherwise segfault will occur. For bug 5327664. Do not merge." into ics-factoryrom
* commit '918494732741c1fdceda6d2e4ea8930b559f26a4':
  If media player has died already, do not dec the old surface texture reference. Otherwise segfault will occur. For bug 5327664. Do not merge.
2011-09-15 17:38:39 -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
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
9184947327 Merge "If media player has died already, do not dec the old surface texture reference. Otherwise segfault will occur. For bug 5327664. Do not merge." into ics-factoryrom 2011-09-15 17:04:27 -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
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
b851f15ee2 Merge "Don't do full backup/restore before setup" 2011-09-15 16:48:42 -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
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
81b37d8bde If media player has died already, do not dec the old surface texture reference.
Otherwise segfault will occur.
For bug 5327664.
Do not merge.

Change-Id: I03ea7bc047aa99a106f1e010dac74f75a833ef84
2011-09-15 15:38:36 -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
1451f1821d Merge "Update docs for RelativeLayout to better explain its interpretation of gravity." 2011-09-15 15:02:55 -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
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
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
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
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
Jamie Gennis
6ba3ff724b Merge "SurfaceFlinger: fix isOpaque check in lockPageFlip" 2011-09-15 11:06:45 -07:00
Gilles Debunne
d513e9746f Bug 5319091: Completions delayed in AutoComplete in landscape
The filtering is an async process. We need to re-update completion
when it is finished.

Changed loogic to mimic the way it was done in GB.

Change-Id: If49048d786b3b9529da55c7247e7ef5f3d0fc8b5
2011-09-15 11:03:56 -07:00
JP Abgrall
c35f98eeae Merge "NetworkManagement SocketTagger: Migrate QTagUid support to JNI." 2011-09-15 10:47:57 -07:00
John Reck
6f4518f88f Merge "Fix finalization" 2011-09-15 10:42:25 -07:00
Gloria Wang
b107c628ba Merge "Do not need to reset surface as NULL in MediaPlayer's _release. Related to bug 5252296." 2011-09-15 10:16:00 -07:00
Guang Zhu
c3afd4c60e Merge "log stack trace when finish() or onDestroy() is called" 2011-09-15 10:07:27 -07:00
John Reck
cda9707167 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.

Change-Id: I693ce83cd607186173d8cf58485c5df28004e52c
2011-09-15 10:01:37 -07:00
Kenny Root
04b08bdf19 Merge "Be more forgiving in parsing verifier IDs" 2011-09-15 09:33:06 -07:00
Daniel Sandler
369711f89b Merge "Fix overlapping wifi and airplane icons." 2011-09-15 07:56:48 -07:00
JP Abgrall
98a4f7e7e1 NetworkManagement SocketTagger: Migrate QTagUid support to JNI.
* Instead of javaland trying to write commands to
   /proc/net/xt_qtaguid/ctrl
use the libcutils/qtaguid.c support via JNI.
* Get rid of tagToKernel() handled by qtaguid library.

Requires libcutils changes from c/132538/

Change-Id: I9de5b3fa4a596c56835024c6d376769a0eea7db1
2011-09-15 02:29:03 -07:00
Guang Zhu
0882eb05af log stack trace when finish() or onDestroy() is called
Some supurious calls to these functions when tests are still
running are observed. Add more logging to see what's the
caller.

Change-Id: I9254c3639bcb8619be39bfbc6981fae5bf5e7efa
2011-09-15 01:28:17 -07:00
Dianne Hackborn
cb995121ee Merge "Final (ha ha) API 14." 2011-09-15 00:32:15 -07:00
Dianne Hackborn
90d92e6098 Final (ha ha) API 14.
Change-Id: I164f9add571f7d825a10036e3b8c9e9eb854d732
2011-09-15 00:28:31 -07:00
Chia-chi Yeh
89dea78603 Merge "VpnDialogs: add string description for translation." 2011-09-15 00:06:23 -07:00
Dianne Hackborn
df82905cf3 Merge "Update the public APIs for finding views by text to optionally use content description." 2011-09-14 22:33:54 -07:00
Jeff Sharkey
fc0ab4c065 Merge "Network stats flag to force complete poll." 2011-09-14 21:44:19 -07:00
Jeff Brown
93578af23e Merge "Velocity Tracker II: The Revenge of Velocity Tracker Bug: 5265529" 2011-09-14 21:27:25 -07:00