27425 Commits

Author SHA1 Message Date
repo sync . build/envsetup.sh lunch passion-en
8c66580759 am 4fc3d2f0: DO NOT MERGE
Merge commit '4fc3d2f0b3237390c37ccc4701bc68e4aa5f9b7a' into gingerbread-plus-aosp

* commit '4fc3d2f0b3237390c37ccc4701bc68e4aa5f9b7a':
  DO NOT MERGE
2010-09-27 17:51:45 -07:00
repo sync . build/envsetup.sh lunch passion-eng
4fc3d2f0b3 DO NOT MERGE
This is a manual cherrypick of:
Change I3a76de15: Fixing font scale in WindowManagerService. There was
a bug that causes WindowManagerService to lose the fontScale setting.

Change-Id: I9b993e11f6a3e75735d8ed05596083893543d732
2010-09-27 17:46:07 -07:00
Hung-ying Tyan
2a36a778d3 am 68ef7f3c: Merge "Move SipService out of SystemServer to phone process." into gingerbread
Merge commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3' into gingerbread-plus-aosp

* commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3':
  Move SipService out of SystemServer to phone process.
2010-09-27 16:29:33 -07:00
Hung-ying Tyan
68ef7f3c3a Merge "Move SipService out of SystemServer to phone process." into gingerbread 2010-09-27 16:25:49 -07:00
Gilles Debunne
4e9243d55c am 8d7057df: Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread
Merge commit '8d7057df401af668335c38273bc62872e4dbf538' into gingerbread-plus-aosp

* commit '8d7057df401af668335c38273bc62872e4dbf538':
  Updated assets in status bar. DO NOT MERGE.
2010-09-27 16:17:28 -07:00
Gilles Debunne
8d7057df40 Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread 2010-09-27 16:07:47 -07:00
Gilles Debunne
c49b259a62 Updated assets in status bar. DO NOT MERGE.
Unlock has a 1 pixel offset that has to be fixed by code.

dropdown untested on device.

Most of these should be removed from SystemUI (revert 68833).

Pass 4.

Change-Id: Ibbbe4cc404151ec28768af98509082d77b303abe
2010-09-27 15:56:26 -07:00
Nick Kralevich
d0cb228b9a am 23142acf: Merge "squeeze a few more bits of randomness into /dev/random" into gingerbread
Merge commit '23142acffab69738b967812fdbdf7bbda18a44d8' into gingerbread-plus-aosp

* commit '23142acffab69738b967812fdbdf7bbda18a44d8':
  squeeze a few more bits of randomness into /dev/random
2010-09-27 15:26:51 -07:00
Nick Kralevich
23142acffa Merge "squeeze a few more bits of randomness into /dev/random" into gingerbread 2010-09-27 15:23:45 -07:00
Winson Chung
55ee8f9329 am 44e8ff99: Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
Merge commit '44e8ff9924db43ee2470d868ce31b1c039c99b35' into gingerbread-plus-aosp

* commit '44e8ff9924db43ee2470d868ce31b1c039c99b35':
  Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
2010-09-27 15:08:57 -07:00
Winson Chung
44e8ff9924 Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
Change-Id: I15a78a5c5a18b041b1cc4a7500bd3ceccd780ea9
2010-09-27 15:04:43 -07:00
Eric Fischer
7063eb1046 am dc36da51: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
Merge commit 'dc36da514832484f61b432291c6f5dca9f2c30bd' into gingerbread-plus-aosp

* commit 'dc36da514832484f61b432291c6f5dca9f2c30bd':
  Trim unwanted whitespace from translations.  DO NOT MERGE
2010-09-27 15:04:35 -07:00
Eric Fischer
dc36da5148 Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread 2010-09-27 15:01:33 -07:00
Nick Kralevich
b91ec410c8 squeeze a few more bits of randomness into /dev/random
Change-Id: Ida30c33985411f353c828b43ea26ca1b7e6502af
2010-09-27 14:49:00 -07:00
Eric Fischer
eb2746a152 Trim unwanted whitespace from translations. DO NOT MERGE
Change-Id: I39809e844c12e283f2ed65b8fc5a6fbe14311071
2010-09-27 14:41:54 -07:00
Gilles Debunne
63555e36c9 am 0ba5b647: Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbread
Merge commit '0ba5b647842ab71f4b1a3080ca113eb646371d91' into gingerbread-plus-aosp

* commit '0ba5b647842ab71f4b1a3080ca113eb646371d91':
  Revert previous status bar assets. DO NOT MERGE.
2010-09-27 14:32:06 -07:00
Gilles Debunne
0ba5b64784 Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbread 2010-09-27 14:26:56 -07:00
Hung-ying Tyan
7e54ef71db Move SipService out of SystemServer to phone process.
Companion CL: https://android-git/g/#change,70187
http://b/issue?id=2998069

Change-Id: I90923ac522ef363a4e04292f652d413c5a1526ad
2010-09-28 05:19:35 +08:00
Chris Palmer
d4f1436d6a am 143e6109: DO NOT MERGE Clarify the explanation of Android\'s security design.
Merge commit '143e61097e3aa2f6fd2951c707f35c35d3be25e3' into gingerbread-plus-aosp

* commit '143e61097e3aa2f6fd2951c707f35c35d3be25e3':
  DO NOT MERGE Clarify the explanation of Android's security design.
2010-09-27 14:18:15 -07:00
Wu-cheng Li
191a25e1da am 83ea6389: Merge "The old overlay should be destroyed if orientation changes." into gingerbread
Merge commit '83ea6389097570e8526a0b612051bb591186f165' into gingerbread-plus-aosp

* commit '83ea6389097570e8526a0b612051bb591186f165':
  The old overlay should be destroyed if orientation changes.
2010-09-27 14:12:49 -07:00
Chris Palmer
143e61097e DO NOT MERGE Clarify the explanation of Android's security design.
Assert plainly that Dalvik is not a boundary.

Certificates are for distinction, not "fake trustworthiness through
verifying cheap identities".

Clarify that UID + GID are what the kernel bases its protection on, not PID.
This is a fuzzy distinction on Android since (apart from sharedUserId and
magical system processes) there is a 1:1 mapping from process <-> UID.  But
it's important to clarify what we mean.

Clarify up front about the staticness (staticity?) of permissions. It's
explained lower down, but experience shows people don't read that far down.
Get the rationale (bad UX --> bad security) right up top.

Change-Id: I403310668d7ba42e44239055cb480c086ef76cbc
2010-09-27 14:12:35 -07:00
Wu-cheng Li
83ea638909 Merge "The old overlay should be destroyed if orientation changes." into gingerbread 2010-09-27 14:09:02 -07:00
Gilles Debunne
bdf2d75694 Revert previous status bar assets. DO NOT MERGE.
Change-Id: I5906a15124f7efe9b19bba18d91d6ddc089601f2
2010-09-27 13:55:09 -07:00
Kenny Root
e7dd4e38c4 am 04a426f5: Merge "Use buffered I/O during certificate parsing" into gingerbread
Merge commit '04a426f5b50a628fb73bc29b003b0e5bece17c27' into gingerbread-plus-aosp

* commit '04a426f5b50a628fb73bc29b003b0e5bece17c27':
  Use buffered I/O during certificate parsing
2010-09-27 12:48:05 -07:00
Kenny Root
04a426f5b5 Merge "Use buffered I/O during certificate parsing" into gingerbread 2010-09-27 12:45:44 -07:00
Dianne Hackborn
a8bce7c8ac am d8691d73: Merge "Allow all apps to call ContentResolver.getType()." into gingerbread
Merge commit 'd8691d73d158acd9ffc63748126e822afd656707' into gingerbread-plus-aosp

* commit 'd8691d73d158acd9ffc63748126e822afd656707':
  Allow all apps to call ContentResolver.getType().
2010-09-27 12:45:31 -07:00
Dianne Hackborn
d8691d73d1 Merge "Allow all apps to call ContentResolver.getType()." into gingerbread 2010-09-27 12:42:34 -07:00
Jeff Brown
9785bf0f2b am 14a288da: Merge "Add suuport for splitting touch events across windows." into gingerbread
Merge commit '14a288da6a372230d9af41da12241fe500eec837' into gingerbread-plus-aosp

* commit '14a288da6a372230d9af41da12241fe500eec837':
  Add suuport for splitting touch events across windows.
2010-09-27 12:37:03 -07:00
Jeff Brown
14a288da6a Merge "Add suuport for splitting touch events across windows." into gingerbread 2010-09-27 12:33:14 -07:00
Joe Onorato
761427f85b am 524ae7dd: Merge "We only need at most one tty icon." into gingerbread
Merge commit '524ae7dd149c6b10814282dc3e2e55a4f755ad29' into gingerbread-plus-aosp

* commit '524ae7dd149c6b10814282dc3e2e55a4f755ad29':
  We only need at most one tty icon.
2010-09-27 11:56:29 -07:00
Joe Onorato
f9f9e248a0 am 6fa4de3c: Merge "If an icon add remove get coalesced, don\'t remove some other icon." into gingerbread
Merge commit '6fa4de3cffe1390f699051fa0c7d21e8058a5ebd' into gingerbread-plus-aosp

* commit '6fa4de3cffe1390f699051fa0c7d21e8058a5ebd':
  If an icon add remove get coalesced, don't remove some other icon.
2010-09-27 11:56:24 -07:00
Hung-ying Tyan
45a83a8967 am fccd5bc7: Fix build.
Merge commit 'fccd5bc78f94b7dcfbcf78ddca83719c9cd1a74f' into gingerbread-plus-aosp

* commit 'fccd5bc78f94b7dcfbcf78ddca83719c9cd1a74f':
  Fix build.
2010-09-27 11:52:35 -07:00
Wu-cheng Li
b3347bc6d7 The old overlay should be destroyed if orientation changes.
Previously the orientation was wrong after suspend and resume.
When the camera app is resumed behide the lock screen, it
orinteation is portrait. When users slide to unlock the screen,
surfaceChanged is called and the orientation is landscape.
The camera app stops the preview, sets the display orientation,
and starts the preview. Overlay should be destroyed if the
orientation has changed.

bug:3031640
Change-Id: I38b527f9ea78c91b538463292152c023383b4695
2010-09-27 11:49:56 -07:00
Joe Onorato
524ae7dd14 Merge "We only need at most one tty icon." into gingerbread 2010-09-27 11:41:24 -07:00
Joe Onorato
6fa4de3cff Merge "If an icon add remove get coalesced, don't remove some other icon." into gingerbread 2010-09-27 11:40:15 -07:00
Joe Onorato
a78df9f2b6 We only need at most one tty icon.
Change-Id: Id8e2c6ba9b15ebafcf12b484f175fdaf98c1fa8a
2010-09-27 11:36:03 -07:00
Joe Onorato
795f2840b4 If an icon add remove get coalesced, don't remove some other icon.
Also adds a test case and turns off the extra logging we added to debug this.

Change-Id: I8640938ae4d1e75c88213177888f363e05ce0fa0
2010-09-27 11:34:46 -07:00
Hung-ying Tyan
44669d31d1 am fd144d76: Merge "SipAudioCall: remove SipManager dependency." into gingerbread
Merge commit 'fd144d7667d9d050b7fb158276ae4623d4ea83b8' into gingerbread-plus-aosp

* commit 'fd144d7667d9d050b7fb158276ae4623d4ea83b8':
  SipAudioCall: remove SipManager dependency.
2010-09-27 11:20:35 -07:00
Hung-ying Tyan
c5027642ff am 025a39af: SIP: misc fixes
Merge commit '025a39af346f39743c1e384b9000ce1baee36562' into gingerbread-plus-aosp

* commit '025a39af346f39743c1e384b9000ce1baee36562':
  SIP: misc fixes
2010-09-27 11:20:30 -07:00
Hung-ying Tyan
fe2d279c5e am 00a22064: SipService: handle cross-domain authentication error
Merge commit '00a22064efef4f574e439079aae2deae1a087a31' into gingerbread-plus-aosp

* commit '00a22064efef4f574e439079aae2deae1a087a31':
  SipService: handle cross-domain authentication error
2010-09-27 11:20:24 -07:00
Hung-ying Tyan
fccd5bc78f Fix build.
Change-Id: Ie47b63f02764e8a1ca1d36f502b6b4134859ff0d
2010-09-28 02:16:32 +08:00
Hung-ying Tyan
fd144d7667 Merge "SipAudioCall: remove SipManager dependency." into gingerbread 2010-09-27 10:54:27 -07:00
Hung-ying Tyan
025a39af34 SIP: misc fixes
+ check REQUEST_TERMINATED response on INVITE not CANCEL,
+ check if a TransactionTerminatedEvent matches the ongoing transaction,
+ add log to track SipConnection disconnect events.

Change-Id: I28325be62ac44e4a7507d3c4b5b78b066c0ea2ad
2010-09-28 01:52:42 +08:00
Hung-ying Tyan
00a22064ef SipService: handle cross-domain authentication error
and add new CROSS_DOMAIN_AUTHENTICATION error code and OUT_OF_NETWORK
DisconnectCause.

http://b/issue?id=3020185

Change-Id: Icc0a341599d5a72b7cb2d43675fbddc516544978
2010-09-27 10:45:24 -07:00
Dan Morrill
c6581a1046 am 4e9751f0: Merge "Adding a feature to indicate that the device possesses low-latency audio. The specific criteria for low-latency audio are defined in the CDD, but since that hasn\'t yet been settled for Gingerbread, this change doesn\'t go into details. We can do a d
Merge commit '4e9751f0770c8bfe6f7d57465cba754af5aa942b' into gingerbread-plus-aosp

* commit '4e9751f0770c8bfe6f7d57465cba754af5aa942b':
  Adding a feature to indicate that the device possesses low-latency audio.
2010-09-27 10:39:19 -07:00
Dan Morrill
4e9751f077 Merge "Adding a feature to indicate that the device possesses low-latency audio. The specific criteria for low-latency audio are defined in the CDD, but since that hasn't yet been settled for Gingerbread, this change doesn't go into details. We can do a docs change later once GB CDD is final." into gingerbread 2010-09-27 10:30:41 -07:00
James Dong
a9f17c8b42 am bf47092e: Merge "Fix track duration calculation if the start timestamp is non-zero" into gingerbread
Merge commit 'bf47092e1e76224474745b6919febd3aa9df5bcf' into gingerbread-plus-aosp

* commit 'bf47092e1e76224474745b6919febd3aa9df5bcf':
  Fix track duration calculation if the start timestamp is non-zero
2010-09-27 10:13:04 -07:00
James Dong
bf47092e1e Merge "Fix track duration calculation if the start timestamp is non-zero" into gingerbread 2010-09-27 10:08:52 -07:00
James Dong
dacebe62c6 Fix track duration calculation if the start timestamp is non-zero
o Updated the comments in the patch
o Added some additional checks on the timestamp

Change-Id: I8ad81eb6bfe358c1db5245cbb52efc905cdc234c
2010-09-27 10:02:15 -07:00
Andreas Huber
fa5c8fc4a4 am abaabb2c: Merge "Support other kinds of HTTP redirect in NuHTTPDataSource" into gingerbread
Merge commit 'abaabb2c7994e5a5026c2e2bd860d7f21eed0451' into gingerbread-plus-aosp

* commit 'abaabb2c7994e5a5026c2e2bd860d7f21eed0451':
  Support other kinds of HTTP redirect in NuHTTPDataSource
2010-09-27 09:24:18 -07:00