3237 Commits

Author SHA1 Message Date
Chung-yih Wang
cffebf85be am 6866ecb9: am 1d62c773: Fix the build
Merge commit '6866ecb92700a03b4285cb8427eedf579f9cf0ea'

* commit '6866ecb92700a03b4285cb8427eedf579f9cf0ea':
  Fix the build
2010-08-05 21:13:25 -07:00
Chung-yih Wang
6866ecb927 am 1d62c773: Fix the build
Merge commit '1d62c7737c33f92e79f0a180b05969f52484e64c' into gingerbread-plus-aosp

* commit '1d62c7737c33f92e79f0a180b05969f52484e64c':
  Fix the build
2010-08-05 21:10:06 -07:00
Chung-yih Wang
024d59601e resolved conflicts for merge of a06ad953 to master
Change-Id: I282525787d7475cc72b2dec10fbc2cf8c5727b82
2010-08-06 12:06:04 +08:00
Chung-yih Wang
1d62c7737c Fix the build
Change-Id: I410e2fd057b68e1b5b5b33ee10178a01d3c9b2fa
2010-08-06 11:52:38 +08:00
Chung-yih Wang
a06ad953a2 am 7324489f: Merge "Add SIP service into system server." into gingerbread
Merge commit '7324489f18ee01586931f577f00567092cbf52df' into gingerbread-plus-aosp

* commit '7324489f18ee01586931f577f00567092cbf52df':
  Add SIP service into system server.
2010-08-05 19:37:59 -07:00
Chung-yih Wang
2d94231ef9 Add SIP service into system server.
Change-Id: Icc39e4e54768cfdcc1b20a3efe6206009b9a8d10
2010-08-06 08:40:50 +08:00
Dianne Hackborn
9f53119b72 First pass at a new clipboard API.
ClipboardManager was in android.text(!!) so it needed to be moved
up to android.content to have access to the richer data types we
now need.

ClippedData is the data representation.  Still needs a lot of
fleshing out to allow holding more than one data type at a time
and perhaps conversions between them.  (MIME-oriented interrogation
and conversion will be done through ContentProvider, which needs
to grow an ability to report multiple MIME types and accept a
desired MIME type when a stream is being opened.)

Change-Id: Ifa51bedcd084a677813b255d171804e8496b0cb5
2010-08-05 12:28:20 -07:00
Daniel Sandler
b5c22f7236 am 811d66f1: am 9b87770f: Merge "Fix crash when startForeground posts a broken Notification." into gingerbread
Merge commit '811d66f1496b64b02c117e8d992db99e9e6cdc8d'

* commit '811d66f1496b64b02c117e8d992db99e9e6cdc8d':
  Fix crash when startForeground posts a broken Notification.
2010-08-05 12:08:25 -07:00
Kenny Root
a2619da056 am d6dc45c3: am 125816a2: Merge "Failure to move .dex in eng builds is not fatal" into gingerbread
Merge commit 'd6dc45c30c1704fca9ec33f51c7c4ec1bee515ea'

* commit 'd6dc45c30c1704fca9ec33f51c7c4ec1bee515ea':
  Failure to move .dex in eng builds is not fatal
2010-08-05 11:46:32 -07:00
Kenny Root
ce845d7301 am c5183aca: am c68bcc32: Merge "Only allow one movePackage operation in-flight" into gingerbread
Merge commit 'c5183acae55e08f4bfcb58aa122a200863748a63'

* commit 'c5183acae55e08f4bfcb58aa122a200863748a63':
  Only allow one movePackage operation in-flight
2010-08-05 10:47:15 -07:00
Robert Greenwalt
208c425e84 Merge "Fix runtime reset (missing case break)." 2010-08-05 08:17:09 -07:00
Daniel Sandler
0f0b11c871 Basic support for notification payloads in the panel.
Line-item veto is there, but allows you to cancel some
notifications you probably shouldn't be canceling. (Should
hide the "X" in those cases.)

No preference given to "sticky" notifications, because
there's no such thing yet.

Notifications are now limited to 4 visible icons, per spec.
The implementation is a total hack for now.

Change-Id: Ibdf433ae94189117f983c510fe5e0cff0bf5c44c
2010-08-05 09:34:50 -04:00
Daniel Sandler
1a655771ef Fix runtime reset (missing case break).
Bug: 2895437
Change-Id: If061c02811144031833f75ad47ae313e2208701c
2010-08-04 23:57:00 -04:00
Daniel Sandler
811d66f149 am 9b87770f: Merge "Fix crash when startForeground posts a broken Notification." into gingerbread
Merge commit '9b87770f53c55a313a7fdc6f553265aabbde3446' into gingerbread-plus-aosp

* commit '9b87770f53c55a313a7fdc6f553265aabbde3446':
  Fix crash when startForeground posts a broken Notification.
2010-08-04 20:36:09 -07:00
Daniel Sandler
9b87770f53 Merge "Fix crash when startForeground posts a broken Notification." into gingerbread 2010-08-04 20:33:32 -07:00
Oscar Montemayor
69238c6a37 Device Policy Manager changes to enable Global Proxy.
Change-Id: I8489df7d28e4c5312e10d5cecc8e2a182413a034
2010-08-04 16:01:56 -07:00
Kenny Root
d6dc45c30c am 125816a2: Merge "Failure to move .dex in eng builds is not fatal" into gingerbread
Merge commit '125816a2a89343efdcccc5a74c2dd8a2608c54a0' into gingerbread-plus-aosp

* commit '125816a2a89343efdcccc5a74c2dd8a2608c54a0':
  Failure to move .dex in eng builds is not fatal
2010-08-04 15:03:56 -07:00
Brad Fitzpatrick
85d21bc6e1 am 9ee17b7d: am 866362fc: Merge "Usage Stats: don\'t block writing stats to disk." into gingerbread
Merge commit '9ee17b7dec7c76830b5add29f3b97039e178629a'

* commit '9ee17b7dec7c76830b5add29f3b97039e178629a':
  Usage Stats: don't block writing stats to disk.
2010-08-04 14:07:55 -07:00
Kenny Root
e2f7417529 Failure to move .dex in eng builds is not fatal
When moving between program locations or application names, the .dex
file is moved by installd. However, in engineering builds, the
applications are run through dexopt on-demand. If the .dex file fails to
move, we can ignore it because it's most likely because the .dex file
does not exist yet.

Change-Id: Id5c4dbfa33f19c976acd9f184ccd637752326629
2010-08-04 13:35:33 -07:00
Konstantin Lopyrev
2bf8028a23 am b59b1209: am 321f7fad: Making sure that there is no notification when focus changes from something to nothing.
Merge commit 'b59b120929f10c1501d27ebab2f69180868e9776'

* commit 'b59b120929f10c1501d27ebab2f69180868e9776':
  Making sure that there is no notification when focus changes from something to nothing.
2010-08-04 11:12:13 -07:00
Kenny Root
c5183acae5 am c68bcc32: Merge "Only allow one movePackage operation in-flight" into gingerbread
Merge commit 'c68bcc320522abf856211e9aa00bba71ccaddacb' into gingerbread-plus-aosp

* commit 'c68bcc320522abf856211e9aa00bba71ccaddacb':
  Only allow one movePackage operation in-flight
2010-08-04 09:18:27 -07:00
Kenny Root
deb112674e Only allow one movePackage operation in-flight
When a movePackage operation is requested, don't allow multiple requests
to pile up for one package. Once a move is completed, an observer will
receive the message and be allowed to call movePackage again.

Change-Id: Ie3842b6d96446febc0037bf9b8f1ca250735edc2
2010-08-04 08:44:31 -07:00
Daniel Sandler
d0a2f86f35 Fix crash when startForeground posts a broken Notification.
The NotificationManager tries to crash the calling app, but
in the case of a service calling startForeground, the caller
is the ActivityManager, so system_server goes down.

NotificationManagerService#enqueueNotificationInternal is a
new internal-only method that accepts a UID/PID to use when
punishing bogus notifications (such as the one in
http://b/2869787).

Change-Id: I84a9854bae630bc90288cebb94f174809d5dac8c
2010-08-04 10:52:51 -04:00
Brad Fitzpatrick
9ee17b7dec am 866362fc: Merge "Usage Stats: don\'t block writing stats to disk." into gingerbread
Merge commit '866362fcb4db93584143c21934ea355cbf9e0757' into gingerbread-plus-aosp

* commit '866362fcb4db93584143c21934ea355cbf9e0757':
  Usage Stats: don't block writing stats to disk.
2010-08-03 17:00:20 -07:00
Brad Fitzpatrick
389a916769 Usage Stats: don't block writing stats to disk.
I was seeing lots of stack traces of people hung for noticeable
amounts of time when switching between activities.

e.g. On of the common gmail stacks showing this pause was:

android.os.StrictMode$StrictModeDiskWriteViolation: policy=391 violation=1
  at android.os.StrictMode$AndroidBlockGuardPolicy.startHandlingViolationException(StrictMode.java:272)
  at android.os.StrictMode$AndroidBlockGuardPolicy.onWriteToDisk(StrictMode.java:243)
  at dalvik.system.BlockGuard$WrappedFileSystem.open(BlockGuard.java:238)
  at java.io.FileOutputStream.<init>(FileOutputStream.java:97)
  at java.io.FileOutputStream.<init>(FileOutputStream.java:69)
  at com.android.server.am.UsageStatsService.writeStatsFLOCK(UsageStatsService.java:424)
  at com.android.server.am.UsageStatsService.writeStatsToFile(UsageStatsService.java:398)
  at com.android.server.am.UsageStatsService.notePauseComponent(UsageStatsService.java:539)
  at com.android.server.am.ActivityManagerService.updateUsageStats(ActivityManagerService.java:1856)
  at com.android.server.am.ActivityStack.startPausingLocked(ActivityStack.java:667)
  at com.android.server.am.ActivityStack.finishActivityLocked(ActivityStack.java:2925)
  at com.android.server.am.ActivityStack.requestFinishActivityLocked(ActivityStack.java:2836)
  at com.android.server.am.ActivityManagerService.finishActivity(ActivityManagerService.java:2276)
  at android.app.ActivityManagerNative.onTransact(ActivityManagerNative.java:237)
  at com.android.server.am.ActivityManagerService.onTransact(ActivityManagerService.java:1415)
  at android.os.Binder.execTransact(Binder.java:320)
  at dalvik.system.NativeStart.run(Native Method)

  at android.app.ActivityManagerProxy.finishActivity(ActivityManagerNative.java:1454)
  at android.app.Activity.finish(Activity.java:3260)
  at android.app.Activity.onBackPressed(Activity.java:1929)
  at android.app.Activity.onKeyUp(Activity.java:1907)
  at android.view.KeyEvent.dispatch(KeyEvent.java:1088)
  at android.app.Activity.dispatchKeyEvent(Activity.java:2087)
  at com.android.internal.policy.impl.PhoneWindow$DecorView.dispatchKeyEvent(PhoneWindow.java:1661)
  at android.view.ViewRoot.deliverKeyEventToViewHierarchy(ViewRoot.java:2543)
  at android.view.ViewRoot.handleFinishedEvent(ViewRoot.java:2516)
  at android.view.ViewRoot.handleMessage(ViewRoot.java:1866)
  at android.os.Handler.dispatchMessage(Handler.java:99)
  at android.os.Looper.loop(Looper.java:123)
  at android.app.ActivityThread.main(ActivityThread.java:3609)
  at java.lang.reflect.Method.invokeNative(Native Method)
  at java.lang.reflect.Method.invoke(Method.java:521)
  at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:868)
  at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:626)
  at dalvik.system.NativeStart.main(Native Method)

Change-Id: Id49157bc635017292eaefddc5e22d73f5f4ab05e
2010-08-03 15:41:05 -07:00
Casey Burkhardt
0920ba5ef1 Fixing font scale in WindowManagerService.
There was a bug that causes WindowManagerService to lose
the fontScale setting.

This fix submitted on behalf of Casey Burkhardt.

Change-Id: I3a76de15adf13badc5efca8d620d14c972a96ec4
2010-08-03 12:22:47 -07:00
Konstantin Lopyrev
b59b120929 am 321f7fad: Making sure that there is no notification when focus changes from something to nothing.
Merge commit '321f7fad5c4a6ef27e944dc72e2ddbfb61af81de' into gingerbread-plus-aosp

* commit '321f7fad5c4a6ef27e944dc72e2ddbfb61af81de':
  Making sure that there is no notification when focus changes from something to nothing.
2010-08-03 11:26:21 -07:00
Konstantin Lopyrev
321f7fad5c Making sure that there is no notification when focus changes from something to nothing.
Change-Id: Ib8b3bdd7f5dd999c933a017fe1b34263afe38e4a
2010-08-03 11:21:55 -07:00
Robert Greenwalt
c76b8fa911 Always try to set/remove default routes
Must clean up default route if a default 3g connection is replaced
by a non-default (ie, mms) connection on the same interface.

Also stop mucking with all connections dns and routes - do it only
for the connection that has changed.

bug:2865974
Change-Id: I589a0b2768b5e67b608fde181e7ddbd7fce4f491
2010-08-02 15:40:21 -07:00
Christopher Tate
1f4c67a4b1 am 79f2d005: am a213ce02: Merge "Mute a common-case progress log about input injection" into gingerbread
Merge commit '79f2d00596b7e24a285443c8e9e77bece3f5e9e2'

* commit '79f2d00596b7e24a285443c8e9e77bece3f5e9e2':
  Mute a common-case progress log about input injection
2010-08-02 15:27:26 -07:00
Christopher Tate
79f2d00596 am a213ce02: Merge "Mute a common-case progress log about input injection" into gingerbread
Merge commit 'a213ce02ced6511edf02e29c45057f344bfe8636' into gingerbread-plus-aosp

* commit 'a213ce02ced6511edf02e29c45057f344bfe8636':
  Mute a common-case progress log about input injection
2010-08-02 15:19:19 -07:00
Christopher Tate
09e85dc027 Mute a common-case progress log about input injection
Change-Id: I37c9f5cb239ab93fde3a42f71f2782d8734c53ce
2010-08-02 11:59:11 -07:00
Kenny Root
98b557de31 am 9117669c: am 8b61b68b: Merge "Only install after MCS success" into gingerbread
Merge commit '9117669c7de41799535dfa88e5d68a30d7674733'

* commit '9117669c7de41799535dfa88e5d68a30d7674733':
  Only install after MCS success
2010-07-30 17:03:51 -07:00
Kenny Root
9117669c7d am 8b61b68b: Merge "Only install after MCS success" into gingerbread
Merge commit '8b61b68b648985df37197de204398f608c4ad8b1' into gingerbread-plus-aosp

* commit '8b61b68b648985df37197de204398f608c4ad8b1':
  Only install after MCS success
2010-07-30 17:00:01 -07:00
Kenny Root
8b61b68b64 Merge "Only install after MCS success" into gingerbread 2010-07-30 16:55:37 -07:00
Kenny Root
6f89fa07b4 Only install after MCS success
If MCS dies in the middle of a call during install, only proceed if the
call was successful. Otherwise wait for the max retries to be reached
and run the failure handling code there.

Change-Id: I00a27ea91046ea6521a3cff5e5ffe2c71b2b5bb4
2010-07-30 16:35:04 -07:00
Brad Fitzpatrick
86dde2d64c am e2d33bbc: am d2165cfc: Merge "StrictMode: time violations in Binder calls" into gingerbread
Merge commit 'e2d33bbc496192d49c1e48baad446d8d0720d301'

* commit 'e2d33bbc496192d49c1e48baad446d8d0720d301':
  StrictMode: time violations in Binder calls
2010-07-30 15:27:56 -07:00
Brad Fitzpatrick
e2d33bbc49 am d2165cfc: Merge "StrictMode: time violations in Binder calls" into gingerbread
Merge commit 'd2165cfce7911dac66d1195ed9123e79b086d22b' into gingerbread-plus-aosp

* commit 'd2165cfce7911dac66d1195ed9123e79b086d22b':
  StrictMode: time violations in Binder calls
2010-07-30 15:23:19 -07:00
Brad Fitzpatrick
d2165cfce7 Merge "StrictMode: time violations in Binder calls" into gingerbread 2010-07-30 15:20:28 -07:00
Brad Fitzpatrick
cb9ceb1029 StrictMode: time violations in Binder calls
Change-Id: I5796993dce98be722cf679b78acaf0c9de0ba461
2010-07-30 14:28:55 -07:00
Jean-Baptiste Queru
154a320069 resolved conflicts for merge of 27eecb70 to gingerbread
Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1
2010-07-30 12:08:31 -07:00
Jean-Baptiste Queru
5ea89f77ea Fix build: HistoryRecord is now ActivityRecord
Change-Id: Ide07d72abd02aeb7e56695f2e98ae7af1568ad1c
2010-07-30 09:30:31 -07:00
Mattias Larsson
5f5548e82d am 85673d91: am a4fd0078: Clear preferred activities when home process crashes
Merge commit '85673d91681e6b5dede0c72f36ed3b81f5c4bb0d'

* commit '85673d91681e6b5dede0c72f36ed3b81f5c4bb0d':
  Clear preferred activities when home process crashes
2010-07-30 08:51:09 -07:00
Mattias Larsson
85673d9168 am a4fd0078: Clear preferred activities when home process crashes
Merge commit 'a4fd0078d138b433d2250a74833ee3cc6424143a' into gingerbread-plus-aosp

* commit 'a4fd0078d138b433d2250a74833ee3cc6424143a':
  Clear preferred activities when home process crashes
2010-07-30 08:45:05 -07:00
Mattias Larsson
a4fd0078d1 Clear preferred activities when home process crashes
If the "default" Home application has been replaced with
a third-party app that is repeatedly crashing at start-up,
there is no way for the user to clear the preferred activities
or uninstall the bad application. If we clear the package
preferred activities when the application crashes, the user
will be prompted with the ResolverActivity at the next boot
and can try using the app again or choose to use another
Home application.

Change-Id: I8ba8e95e6752916d50515d96c117d3084fa980fd
2010-07-30 08:36:42 -07:00
Dianne Hackborn
d4e60a1f8e Merge "Maybe fix issue #2881233: reboot loop at boot on stingray" 2010-07-29 19:16:18 -07:00
Dianne Hackborn
154db5f635 Maybe fix issue #2881233: reboot loop at boot on stingray
Change-Id: I4bd88fdd506d061146c441143d39b796a8df2f49
2010-07-29 19:15:19 -07:00
Jean-Baptiste Queru
8f5d160c92 am 0c51c98f: am 4506c62a: fix inaccurate copyrights
Merge commit '0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf'

* commit '0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf':
  fix inaccurate copyrights
2010-07-29 17:54:42 -07:00
Jean-Baptiste Queru
0c51c98fd9 am 4506c62a: fix inaccurate copyrights
Merge commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625' into gingerbread-plus-aosp

* commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625':
  fix inaccurate copyrights
2010-07-29 17:52:09 -07:00
Jean-Baptiste Queru
4506c62abd fix inaccurate copyrights
Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
2010-07-29 17:35:37 -07:00