Commit Graph

6113 Commits

Author SHA1 Message Date
repo sync
b95dc6834e am 82afa6e6: Merge "Fix IPv6 on wifi"
* commit '82afa6e61e6e8df57b71096a9f07eda956442fec':
  Fix IPv6 on wifi
2011-09-30 09:59:52 -07:00
repo sync
82afa6e61e Merge "Fix IPv6 on wifi" 2011-09-30 09:57:36 -07:00
Kenny Root
6f85220da8 am 83a5926e: Merge "Add DUMP permission checks to services"
* commit '83a5926ee349a3daf33cd8efd21e312fc0b1621e':
  Add DUMP permission checks to services
2011-09-30 08:58:46 -07:00
Kenny Root
83a5926ee3 Merge "Add DUMP permission checks to services" 2011-09-30 08:57:43 -07:00
satok
f92565be01 am 3e21c99f: Merge "Fix a logic to recconect IME in InputMethodManagerService"
* commit '3e21c99f10de1acdd373fbb166a7618bebfceba0':
  Fix a logic to recconect IME in InputMethodManagerService
2011-09-30 05:46:43 -07:00
satok
d092245ed9 am 594cb476: Merge "Use user\'s settings for the spell check language instead of the system locale"
* commit '594cb476547b38098018e80b5f70935ff60d9551':
  Use user's settings for the spell check language instead of the system locale
2011-09-30 05:46:41 -07:00
satok
3e21c99f10 Merge "Fix a logic to recconect IME in InputMethodManagerService" 2011-09-30 03:31:35 -07:00
satok
59b424c3b6 Fix a logic to recconect IME in InputMethodManagerService
Bug: 5380216

Change-Id: I7af67265eebbd28f002210d7ac90dd18f1858f66
2011-09-30 19:26:01 +09:00
satok
70deff4c10 Use user's settings for the spell check language instead of the system locale
Bug: 5390462
Change-Id: Ia2a3981cb93f451646debe5ee6b037313825cf9f
2011-09-30 17:49:40 +09:00
Christopher Tate
e8f2dcaf43 am 86b73497: Merge "Enforce DUMP permission on BackupManagerService\'s dump() method"
* commit '86b734972d4290a5d7f4c724f7ed14bbe36641f9':
  Enforce DUMP permission on BackupManagerService's dump() method
2011-09-29 17:30:39 -07:00
repo sync
7960d9f888 Fix IPv6 on wifi
Bug: 5388757
Change-Id: I3c8c776c26dad1daa9801d0455fde749c0206401
2011-09-29 16:59:01 -07:00
Christopher Tate
b8491bb75f Enforce DUMP permission on BackupManagerService's dump() method
The text of the dumped output can potentially include an email address;
we don't want random code to be able to read it.

Bug 5389201

Change-Id: If84886357a36b7015878e4d72017abba83b4c511
2011-09-29 15:13:11 -07:00
Kenny Root
3abd75ba3a Add DUMP permission checks to services
Some services have info that is not readily available any other way. Add
a permission check to those services.

Bug: 5389201
Change-Id: I5a9724ec89e1c11ef7813eeb52a6a05b3ea92af5
2011-09-29 11:04:15 -07:00
Lorenzo Colitti
ff41f17be8 am 805f43cd: Merge "Revert "Tell the resolver what protocols to use.""
* commit '805f43cd0daa1369ce3da7b617a4e3fe649f45ef':
  Revert "Tell the resolver what protocols to use."
2011-09-29 10:53:49 -07:00
Lorenzo Colitti
c1358b240c Revert "Tell the resolver what protocols to use."
Change Ife82a8d8 broke IPv6 on wifi. Change I4e3a69ea is
an alternate approach that does not require any framework
changes.

Bug: 5284168
Change-Id: Ib6e002aa23700adc71051cf6b76860545497dbf4
2011-09-28 23:07:03 -07:00
Christopher Tate
a75f0dc303 am d7208b98: am 7462251b: Merge "Don\'t hang in restore if the transport reports failure" into ics-factoryrom
* commit 'd7208b98e97abcbc728cb748cc6ff99332b6750f':
  Don't hang in restore if the transport reports failure
2011-09-26 20:42:51 -07:00
Christopher Tate
d7208b98e9 am 7462251b: Merge "Don\'t hang in restore if the transport reports failure" into ics-factoryrom
* commit '7462251b0a3f2601236b599bcabf54451143b704':
  Don't hang in restore if the transport reports failure
2011-09-26 20:40:56 -07:00
Christopher Tate
91268bf6b8 am 84da4e47: Merge "Use the new INSTALL_FROM_ADB Package Manager flag..."
* commit '84da4e47e723bd27165da8dff735bd508e909610':
  Use the new INSTALL_FROM_ADB Package Manager flag...
2011-09-26 19:18:00 -07:00
Romain Guy
d44413fb1e am 1867a3cd: Merge "Do not blend opaque windows."
* commit '1867a3cde6411cfa27d0339c973d94fe0287d1a8':
  Do not blend opaque windows.
2011-09-26 19:17:49 -07:00
Christopher Tate
7462251b0a Merge "Don't hang in restore if the transport reports failure" into ics-factoryrom 2011-09-26 17:12:08 -07:00
Christopher Tate
84da4e47e7 Merge "Use the new INSTALL_FROM_ADB Package Manager flag..." 2011-09-26 17:12:01 -07:00
Christopher Tate
ab63aa87c1 Use the new INSTALL_FROM_ADB Package Manager flag...
...when installing an apk in the course of an 'adb restore' operation.

Fixes bug 5374597.

Change-Id: I8ddce0e015e3bab79432e82709d841887667c346
2011-09-26 16:30:30 -07:00
Romain Guy
1867a3cde6 Merge "Do not blend opaque windows." 2011-09-26 16:13:01 -07:00
Romain Guy
7036fdd099 Do not blend opaque windows.
This change ensures the wallpaper is rendered into an opaque surface
which avoids a glClear() in SurfaceFlinger. This should save quite
a bit of work on every frame when panning the workspace in launcher.

Change-Id: Id43d3498a54c2d60ec4ee3377c92ef79bff55bc1
2011-09-26 16:12:04 -07:00
Romain Guy
4941dea00a Do not blend opaque windows.
This change ensures the wallpaper is rendered into an opaque surface
which avoids a glClear() in SurfaceFlinger. This should save quite
a bit of work on every frame when panning the workspace in launcher.

Change-Id: I9c1b8c324edf29826d5dbb1fb39d883e43375310
2011-09-26 16:08:14 -07:00
Christopher Tate
5f2f41350e Don't hang in restore if the transport reports failure
Casualty of the recent refactoring: in this particular error case,
the restore sequence wasn't being directed into the finalization
state.  Fixes bug 5336295.

Change-Id: Ibf5570cd1003e123da8b561685de8479663340ce
2011-09-26 13:10:38 -07:00
Ben Komalo
8725bb592e am 8154495f: am 69a6d537: Merge "Enter minimal boot mode when booting encrypted" into ics-factoryrom
* commit '8154495fc7b09938709ded2d07e8f9419cc94be7':
  Enter minimal boot mode when booting encrypted
2011-09-26 12:05:15 -07:00
Ben Komalo
8154495fc7 am 69a6d537: Merge "Enter minimal boot mode when booting encrypted" into ics-factoryrom
* commit '69a6d537e6f29683f685ecb688f0b06b1c0b2b15':
  Enter minimal boot mode when booting encrypted
2011-09-26 12:02:19 -07:00
Kenny Root
59ad0330ac am 8a663c89: Merge "Allow non-required package verifiers"
* commit '8a663c89a3b5bda4e749a58d0434b130260eabb2':
  Allow non-required package verifiers
2011-09-26 09:55:56 -07:00
Kenny Root
8a663c89a3 Merge "Allow non-required package verifiers" 2011-09-26 09:53:06 -07:00
Jeff Sharkey
b7b79b10fd am 61c0818f: Merge "Watch network subtype, tethering teardown, empty."
* commit '61c0818f2425691e67921ee41ca80e62d2cb9004':
  Watch network subtype, tethering teardown, empty.
2011-09-25 23:46:03 -07:00
Jeff Sharkey
61c0818f24 Merge "Watch network subtype, tethering teardown, empty." 2011-09-25 23:44:10 -07:00
Jeff Brown
c976aec618 am 4c253119: Merge "Prevent unintended rotations. Bug: 4981385"
* commit '4c253119db0ce753e46ec3809b54b9e357d363db':
  Prevent unintended rotations. Bug: 4981385
2011-09-23 18:29:49 -07:00
Jeff Brown
4c253119db Merge "Prevent unintended rotations. Bug: 4981385" 2011-09-23 18:28:01 -07:00
Jeff Brown
c0347aa19f Prevent unintended rotations.
Bug: 4981385

Changed the orientation listener to notify the policy whenever
its proposed orientation changes, and changes the window manager
to notify the orientation listener when the actual orientation
changes.  This allows us to better handle the case where the
policy has rejected a given proposal at one time (because the
current application forced orientation) but might choose
to accept the same proposal at another time.

It's important that the proposal always be up to date.  A proposal
becomes irrelevant as soon as the phone posture changes such
that we can no longer determine the orientation with confidence
(such as when a device is placed flat on a table).

Simplified the orientation filtering.  Now we just wait 200ms
for the device to be still before issuing a proposal.  The idea
is that if the device is moving around a lot, we assume that
the device is being picked up or put down or otherwise in
the process of being moved.  We don't want to change the rotation
until that's all settled down.  However, we do want to tolerate
a certain amount of environmental noise.

(The previous confidence algorithm was also designed along
these lines but it was less direct about waiting for things
to settle.  Instead it simply made orientation changes take
longer than usual while unsettled, but the extra delay was often
too much or too little.  This one should be easier to tune.)

Change-Id: I09e6befea1f0994b6b15d424f3182859c0d9a530
2011-09-23 17:26:09 -07:00
Kenny Root
05ca4c9064 Allow non-required package verifiers
* Verifiers can be specified in the AndroidManifest.xml

* Those verifiers can respond to the new Intent action

* PackageManager API for those verifiers: verifyPendingInstall

Change-Id: I4892bce2e6984871e6e93c60a1ca0dae145f5df5
2011-09-23 16:03:03 -07:00
Ben Komalo
3573d400a5 Enter minimal boot mode when booting encrypted
Bug: 5233488
Change-Id: Iba7a41c69af2387594d2be562d587918cd17a348
2011-09-23 15:08:24 -07:00
Dianne Hackborn
0ba3f30655 am a982ad19: Merge "Fix issue #5173952: Opening a Notification From Lock Screen..."
* commit 'a982ad19d2aee54f714fa3ad9ee4ddbac08dc0fe':
  Fix issue #5173952: Opening a Notification From Lock Screen...
2011-09-23 14:56:48 -07:00
Dianne Hackborn
90c52de286 Fix issue #5173952: Opening a Notification From Lock Screen...
...Should Skip Unsecure Lockscreen (ICS)

Also while I am in there, clean up logging of intent objects to include
even less sensitive information, while showing the true Intent in dump
output (since apps can't get to that).

Change-Id: I35fed714645b21e4304ba38a11ebb9c4c963538e
2011-09-23 13:39:33 -07:00
Dianne Hackborn
04d98fb638 am 67c5b125: Merge "Fix issue #5321282: Force Stop Button in Battery Screen Not disabled correctly"
* commit '67c5b1251178532726964c2e0f4229d079ff0a3e':
  Fix issue #5321282: Force Stop Button in Battery Screen Not disabled correctly
2011-09-23 12:58:33 -07:00
Dianne Hackborn
67c5b12511 Merge "Fix issue #5321282: Force Stop Button in Battery Screen Not disabled correctly" 2011-09-23 12:56:42 -07:00
Kenny Root
e327fe4611 am 3f816086: Merge "Less verbose message when dexopt non-APK"
* commit '3f8160868003eb2525e5a69ed6b0a1790a30cd1b':
  Less verbose message when dexopt non-APK
2011-09-23 12:51:17 -07:00
Kenny Root
fec5e75c96 Less verbose message when dexopt non-APK
The message when something is not an APK that is submitted for dexopt is
not extremely helpful. Make it more precise and remove the useless
traceback.

Change-Id: Ibb34b2b2c10ee28ea98662c3f6fd070529cf8c4f
2011-09-23 10:13:06 -07:00
Robert Greenwalt
097e5f3710 am 511ecc8c: am b849074c: Merge "Tell the resolver what protocols to use." into ics-factoryrom
* commit '511ecc8cf9f1b0660c4284f667cbc3807d2ebf82':
  Tell the resolver what protocols to use.
2011-09-22 23:44:49 -07:00
Robert Greenwalt
511ecc8cf9 am b849074c: Merge "Tell the resolver what protocols to use." into ics-factoryrom
* commit 'b849074cb58edc15b0764afdde0326c0b6d5b147':
  Tell the resolver what protocols to use.
2011-09-22 23:39:53 -07:00
Dianne Hackborn
80a7ac1063 Fix issue #5321282: Force Stop Button in Battery Screen Not disabled correctly
If the app had activities still finishing, when we checked whether it was
now stopped we would get told no.  Also some other improvements:

- Schedule an idle as part of the force stop, to get any finishing
  activities out of the stack soon rather than waiting for some activity
  to idle.
- Don't filter out stopped system apps.  This is dangerous because
  system apps may have no way for the user to explicitly launch them,
  so they could get put into a stopped state for which there is no way
  to get them out.  Also if the user really wants a system app to not
  run, the new disabling mechanism is more appropriate.

Change-Id: I34003f21dac29e2ca0f66a23b88c710de41bab99
2011-09-22 18:32:52 -07:00
Robert Greenwalt
b849074cb5 Merge "Tell the resolver what protocols to use." into ics-factoryrom 2011-09-22 16:57:43 -07:00
Robert Greenwalt
d90c611a59 Tell the resolver what protocols to use.
Stop guessing based on the connectivity of the default route and use the correct
v4/v6 proto for your pid.

bug:5284168
Change-Id: Ife82a8d8e54c0ace2bc9e8a624b11d29a4e285e2
2011-09-22 16:43:15 -07:00
Jason Simmons
8e64fca6f1 resolved conflicts for merge of fb49cd95 to ics-aah
Change-Id: I55cfbddf87914bbdb74998b1676b245182f3a6fd
2011-09-22 16:36:14 -07:00
Jeff Sharkey
367d15ab1a Watch network subtype, tethering teardown, empty.
Watch for changes to telephony network subtype, and update iface
mapping to persist stats under correct type.  Update network stats
before removing tethering NAT rules.

Skip recording that would create empty historical buckets.  Query UID
stats before iface stats to always skew positive when counters are
actively rolling forward.

Bug: 5360042, 5359860, 5335674, 5334448
Change-Id: I8aa37b568e8ffb70647218aa1aff5195d3e44d5a
2011-09-22 16:19:06 -07:00