9686 Commits

Author SHA1 Message Date
Elliott Hughes
4c686dad83 am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>."
* commit 'cceed1dfe13e99c4ffdc2586bff22d325a57c599':
  Include <sys/socket.h> instead of <linux/socket.h>.
2012-09-12 11:04:45 -07:00
Elliott Hughes
778c859bfd Include <sys/socket.h> instead of <linux/socket.h>.
In newer kernels, <linux/socket.h> no longer contains some of the stuff you're
using.

Change-Id: I92c6847d73c20fb49d0db15c1cc15aa07fb5d44d
2012-09-11 18:50:25 -07:00
Jean-Baptiste Queru
5409955555 am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client"
* commit '380a8e3d126374b0205e8452bf2b4b70779e2606':
  Am: Clean mLaunchingProviders of all providers started by the client
2012-09-05 12:10:48 -07:00
Jean-Baptiste Queru
380a8e3d12 Merge "Am: Clean mLaunchingProviders of all providers started by the client" 2012-09-05 11:40:30 -07:00
Jean-Baptiste Queru
9eb3bd88f1 am 42a58ecd: Merge "Revert "Watchdog: Improvement of debuggability""
* commit '42a58ecd27783d347242206bcffd4052cf1d5164':
  Revert "Watchdog: Improvement of debuggability"
2012-09-05 11:01:25 -07:00
Jean-Baptiste Queru
784827b27c Revert "Watchdog: Improvement of debuggability"
This reverts commit 9211b13c3268035b0da0c51ed2d6d5a578d45ff3.
2012-09-04 13:35:12 -07:00
Vairavan Srinivasan
4ee364982e Am: Clean mLaunchingProviders of all providers started by the client
Launching providers is removed from mLaunchingProviders when the client
process dies and works as long as the client process had requested just
one provider and not otherwise. Fix is to make sure mLaunchingProviders
is updated to remove all providers launched by the client process.

Change-Id: Ib4b8b44b6a102762a6558f65fb2e6dbf11d725ea
2012-09-03 17:09:58 -07:00
Dianne Hackborn
862c383530 am 4b60a8d1: Merge "Added check of ActivityInfo launch mode when starting activity."
* commit '4b60a8d1b8b5f8fd04df5749ce225ed57e0a1a44':
  Added check of ActivityInfo launch mode when starting activity.
2012-08-30 15:59:40 -07:00
Dianne Hackborn
4b60a8d1b8 Merge "Added check of ActivityInfo launch mode when starting activity." 2012-08-30 15:19:03 -07:00
Jean-Baptiste Queru
147ef94485 am 60d1e1a0: Merge "Watchdog: Improvement of debuggability"
* commit '60d1e1a09e4603e24652e930597ab204855eaa77':
  Watchdog: Improvement of debuggability
2012-08-30 13:49:58 -07:00
rikard dahlman
9211b13c32 Watchdog: Improvement of debuggability
If the watchdog detects a problem the system server process
is killed, that is followed by a crash. Because the crash is
done after the system server process is killed, the crash
don't contain info about the system server.
This improvement will make sure that the system is crashed
before the system server process is killed.
Behavior is only changed for eng and userdebug builds.

Change-Id: I9f1c8fd8b03d0114032ed44fb582705ad0b49733
2012-08-30 12:27:50 +02:00
Jean-Baptiste Queru
ba37d595f7 am e70a32af: am eb00f951: Merge "VibratorService: Fix to ensure actual delay in a vibrate pattern"
* commit 'e70a32afc5b27ddc9681efd867780a0c4c77edd3':
  VibratorService: Fix to ensure actual delay in a vibrate pattern
2012-08-27 08:13:27 -07:00
Jean-Baptiste Queru
eb00f95143 Merge "VibratorService: Fix to ensure actual delay in a vibrate pattern" 2012-08-27 07:55:41 -07:00
Jean-Baptiste Queru
29c6f24b25 am 6ffe2594: Merge "restorecon /data/anr directory."
* commit '6ffe2594674f250c16c5e3055aa69680efaa6f69':
  restorecon /data/anr directory.
2012-08-22 07:46:41 -07:00
Jean-Baptiste Queru
6ffe259467 Merge "restorecon /data/anr directory." 2012-08-22 07:18:39 -07:00
Amith Yamasani
ff7735b0ee am a3db5297: Merge "ProviderMap: remove hashmap when entire user specific entries are removed"
* commit 'a3db5297cda370ce41db99b6839cd9528c31ef7c':
  ProviderMap: remove hashmap when entire user specific entries are removed
2012-08-20 10:45:12 -07:00
Amith Yamasani
a3db5297cd Merge "ProviderMap: remove hashmap when entire user specific entries are removed" 2012-08-20 10:16:36 -07:00
rpcraig
ec7ed14c18 restorecon /data/anr directory.
Restore the security contexts of anr directory
when initially created.

Change-Id: Ia731414ccbcdc7369d24be6db0003c53abcf6ef4
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2012-08-20 06:08:01 -04:00
Vairavan Srinivasan
e4c56d9367 VibratorService: Fix to ensure actual delay in a vibrate pattern
delay might timeout early as value of duration isn't updated
correctly in the loop, should the wait be interrupted, to reflect
the elapsed time. Fix is to update duration in the loop.

Change-Id: I525b0e97799b288f46ae3a056cff7dcc69701bb0
2012-08-19 12:08:42 -07:00
Robert Greenwalt
c48ee60426 am 6626398a: Merge "Fix for updating TCP buffer size when switching network type"
* commit '6626398a72ae592e3a9184c9b0868df0fc1f1724':
  Fix for updating TCP buffer size when switching network type
2012-08-17 13:28:25 -07:00
Robert Greenwalt
6626398a72 Merge "Fix for updating TCP buffer size when switching network type" 2012-08-17 13:01:49 -07:00
Magnus Strandberg
1968256926 Fix for updating TCP buffer size when switching network type
When PDP connects in GSM network, the TCP buffer window size is
set to max 8760. If the phone swicthes to UMTS, the TCP buffer
size is not updated to UMTS, i.e. GPRS buffer size is still
used with limited data transfer spead as a result.
This fix makes sure the TCP buffer size is updated when
switching network type.

Change-Id: Iaa527c84f56cae108f4c7276bbed10552faaff6c
2012-08-17 11:38:44 +02:00
Kenny Root
050c87f87e am a950daf5: Merge changes Ieb566a2a,I953057cd
* commit 'a950daf5c14a0009c2c62e9c3e0e8d51eb0cf7d9':
  Use Libcore's stat instead of FileUtils#getFileStatus
  Use Libcore.os.stat instead of FileUtils
2012-08-16 16:33:40 -07:00
Kenny Root
a2e8365cc8 am 9b0da58e: Merge "Introduce a restorecon JNI binding."
* commit '9b0da58e3a30b760de37138cdd51d20f269c383e':
  Introduce a restorecon JNI binding.
2012-08-16 15:29:41 -07:00
Kenny Root
786cbcacd2 Use Libcore.os.stat instead of FileUtils
PackageManagerService just needed to know the owner for this file, so
just use stat instead so we can remove the old JNI code.

This is the last user of FileUtils#getPermissions so just remove the
FileUtils method as well.

Change-Id: I953057cd6b9de4410f33b6f22e4bddff02fe2988
2012-08-16 15:27:55 -07:00
Kenny Root
9b0da58e3a Merge "Introduce a restorecon JNI binding." 2012-08-16 14:38:30 -07:00
Vairavan Srinivasan
8809004bc5 ProviderMap: remove hashmap when entire user specific entries are removed
User specific entries in  mProvidersByNamePerUser and mProvidersByClassPerUser
isn't cleared when entire user specific providers are removed. Fix is to remove
the user specific hashmap in such cases.

Change-Id: I6edf211ced873e59f3b89ffceb9eceec13ea8f3f
2012-08-15 23:37:45 -07:00
Johan Viktorsson
f363dfd26c Added check of ActivityInfo launch mode when starting activity.
When starting a singleTop activity from a singleInstance activity,
the onNewIntent() callback was not called when expected. The
reason for this was that only the launchMode specified on the
intent was checked and not the launchMode specified in the manifest.

Fixes issue 17137.

Change-Id: I1a9bc1007d6f5145bf93a6161534732bf5214b7a
2012-08-15 09:13:37 +02:00
Mike Lockwood
f02354e208 am 9064a483: Merge "Added missing USB_DEVICE_ATTACHED broadcast to running Activity"
* commit '9064a48365c131ef5f64b26ab33dd40a7d1246a7':
  Added missing USB_DEVICE_ATTACHED broadcast to running Activity
2012-08-13 20:42:42 -07:00
Mike Lockwood
9064a48365 Merge "Added missing USB_DEVICE_ATTACHED broadcast to running Activity" 2012-08-13 19:59:38 -07:00
Kenny Root
3221bf27ff am 438a0efc: Do not eject internal ASECs when storage unmounted
* commit '438a0efcfbee5dc953e8e5bbdf4cb3dbe94b3f80':
  Do not eject internal ASECs when storage unmounted
2012-08-13 11:40:10 -07:00
Kenny Root
438a0efcfb Do not eject internal ASECs when storage unmounted
If the incoming request is to notify of storage unmounted, don't mess
with apps that are in internal ASECs.

Bug: 6948035
Change-Id: I63ffb895c4d994ee03a5a9bd6bb23f69c88e2a87
2012-08-13 10:51:09 -07:00
Kenny Root
fa74f7e04f am bba948dc: Merge "Delay AccountManagerService initialization" into jb-dev
* commit 'bba948dc9e95baab9e6fb728927aada4a00d93de':
  Delay AccountManagerService initialization
2012-07-31 11:17:11 -07:00
Kenny Root
bba948dc9e Merge "Delay AccountManagerService initialization" into jb-dev 2012-07-31 11:14:02 -07:00
Nick Pelly
5dcbe638ee am 1af5ac1b: Merge "DO NOT MERGE. Add package-name-prefix blacklist for location updates." into jb-dev
* commit '1af5ac1b6801c4da2ef689449fd1fd2eba1ff48e':
  DO NOT MERGE. Add package-name-prefix blacklist for location updates.
2012-07-31 09:20:25 -07:00
Kenny Root
26ff6626fc Delay AccountManagerService initialization
Since applications can have Account providers, they need to be delayed
until after PackageManagerService says everything is mounted.
Otherwise the accounts associated with that provider will be removed
immediately when startup happens.

Bug: 6820670
Change-Id: Iba81765260421649f706624d0605a40ebc1347b1
2012-07-30 16:28:44 -07:00
Nick Pelly
48c5eb018b DO NOT MERGE. Add package-name-prefix blacklist for location updates.
The Settings.Secure value locationPackagePrefixBlacklist and
locationPackagePrefixWhitelist contains comma seperated package-name
prefixes.

Location & geo-fence updates are silently dropped if the receiving
package name has a prefix on the blacklist. Status updates are
not affected. All other API's work as before.

A content observer is used so run-time updates to the blacklist
apply immediately. There is both a blacklist and a whitelist.
The blacklist applies first, and then exemptions are allowed
from the whitelist. In other words, if your package name prefix
matches both the black AND white list, then it is allowed.

Change-Id: I4ea2ad56fa6bd75d32151bc250ac25c26a5777c4
2012-07-30 13:17:30 -07:00
rpcraig
554cb0c290 Introduce a restorecon JNI binding.
Label the vmdl.*\.tmp files and the final .apk file differently.
Modify the WallpaperManagerService to restorecon the wallpaper file.

Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>

Change-Id: Idfc056e9ec0508d7e11100626a7114f341f1af70
2012-07-25 11:07:39 -04:00
Wink Saville
33034b13ca Create telephony-common and mms-common - DO NOT MERGE
These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
  frameworks/base/core/java/com/google/android/mms
to:
   frameworks/opt/mms

telephony-common was created by moving some of
   frameworks/base/telephony
to:
   frameworks/opt/telephony

Change-Id: If6cb3c6ff952767fc10210f923dc0e4b343cd4ad
2012-07-17 12:23:09 -07:00
Adam Cohen
a46cdc04fa am c80f72f7: Merge "Fixing issue where you couldn\'t set null RemoteViews for a widget" into jb-dev
* commit 'c80f72f75e8d5b5fa85b694b64510fad74ea345d':
  Fixing issue where you couldn't set null RemoteViews for a widget
2012-07-16 15:33:19 -07:00
Adam Cohen
c80f72f75e Merge "Fixing issue where you couldn't set null RemoteViews for a widget" into jb-dev 2012-07-16 15:29:44 -07:00
Adam Cohen
e582746621 Fixing issue where you couldn't set null RemoteViews for a widget
-> As noted here: http://code.google.com/p/android/issues/detail?id=35014

Change-Id: Id5d1c47b6961d4b448453d8b16700801c0137f2b
2012-07-16 13:56:17 -07:00
Wink Saville
a639b311e9 Create telephony-common and mms-common
These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
  frameworks/base/core/java/com/google/android/mms
to:
   frameworks/opt/mms

telephony-common was created by moving some of
   frameworks/base/telephony
to:
   frameworks/opt/telephony

Change-Id: If6cb3c6ff952767fc10210f923dc0e4b343cd4ad
2012-07-11 16:02:08 -07:00
Craig Mautner
64ab8fcd6f am dcddea95: Merge "Handle keyguard visibility states separately. DO NOT MERGE" into jb-dev
* commit 'dcddea95301641e3dc9692ed7d70127085458a24':
  Handle keyguard visibility states separately. DO NOT MERGE
2012-07-11 15:18:14 -07:00
Craig Mautner
f333f5f67a Handle keyguard visibility states separately. DO NOT MERGE
Previous to this change the forceHiding variable was a boolean. This
change recognizes the different configurations of the keyguard by
defining separate states for forceHiding and testing for window
visibility differently in each state.

Fixes bug 6786114.

Change-Id: I3460c45ea6da772a4ff76bb016de7aa4b051a673
2012-07-11 14:38:29 -07:00
Craig Mautner
c751e37c4f am cc935071: Merge "DO NOT MERGE Set force hiding differently" into jb-dev
* commit 'cc93507124855591be40af55a94deeb33d74e719':
  DO NOT MERGE Set force hiding differently
2012-07-02 17:22:40 -07:00
Craig Mautner
cc93507124 Merge "DO NOT MERGE Set force hiding differently" into jb-dev 2012-07-02 17:20:00 -07:00
Craig Mautner
80059d6c1b am 00b9e899: Merge "Clear startingDisplayed flag when removing window." into jb-dev
* commit '00b9e899320488ff5623d8c80258ed7dfefc7b53':
  Clear startingDisplayed flag when removing window.
2012-07-02 17:05:16 -07:00
Craig Mautner
38b2478f63 Clear startingDisplayed flag when removing window.
The flag indicating that the Starting window is displayed was not
being cleared when the Starting window was removed. That caused the
goodToGo indication to falsely indicate that all windows were drawn
when in fact the destination activity had not yet been drawn. This
caused the animation to begin when it was still black behind the old
animation.

This fixes bug 6764727.

Change-Id: Iacef73b0335b9bde2cdc8d0b072034222cd728e8
2012-07-02 16:21:28 -07:00
Craig Mautner
503d6a44a8 DO NOT MERGE Set force hiding differently
Only force hide windows when the keyguard is animating in.

Fixes bug 6721572.

Change-Id: Iad7b8b811bcf0840726cbf6c6f279dabd08a3aba

Conflicts:

	services/java/com/android/server/wm/WindowAnimator.java
2012-07-02 13:16:15 -07:00