Commit Graph

11875 Commits

Author SHA1 Message Date
Michael Wright
6fa9c5cd01 Merge "Make sure NaturalSurfaceLayout is consistent with SurfaceControl" 2016-01-12 22:20:52 +00:00
Michael Wright
3a87cb0192 Merge "Animate backlight quickly when display state request to change or power mode changed" 2016-01-12 21:46:38 +00:00
mochangming
f0cb46cd65 Animate backlight quickly when display state request to change or power mode changed
* mAppliedDimming should be false when power request policy is not dim.
  * mAppliedLowPower should be false when low power mode is disabled.
  * Backlight brightness changes quickly.

Change-Id: I44bf9c216554f8dce5abd0520f198824df5e8dcf
Signed-off-by: mochangming <mochangming@xiaomi.com>
2016-01-12 12:42:52 +08:00
Todd Kennedy
819d2745b4 Update PackageInstaller install handing
* Allow forcing permission check. We want to modify the PackageInstaller to
use the PackageInstallerSession for better security / remove deprecated APIs.
In order to do this and continue to prompt for permissions, we need to prevent
the PakcageInstaller from auto-approving the permissions.

* Add originating UID to SessionParams. This is used for package verifier
checks.

Bug: 22282121
Change-Id: I19079749d20ace66f1332f399d52cb0fb8784cd9
2016-01-07 13:51:16 -08:00
Wale Ogunwale
8683f1b160 Merge "[WindowManagerService] fix starting window issue" 2016-01-06 15:47:05 +00:00
Ronnie Leng
a8d54b243b [WindowManagerService] fix starting window issue
Symptom:
1. Acitivity A and B belong to same task.
2. A is started and start B in its code
3. B is opened with blank screen

If starting icon has been display, both startingWindow and
startingView should not be null.
Current logic only uses judgement on startWindow. In above
case, it leads startingView set to null as A and B shares
the same starting window due to same task. Then system will
not get chance to remove startingView as it is null.

It needs add judgement on startingView.

Change-Id: I6cfa1a3ebce93ce435cc2d9ada239b1e808988de
2016-01-04 11:36:08 -06:00
yang.xa.liu
40d73a7997 Make sure NaturalSurfaceLayout is consistent with SurfaceControl
SurfaceControl and NaturalSurfaceLayout will be created in screen-off
mode. Screen-on animation also creates NaturalSurfaceLayout. And
NaturalSurfaceLayout uses the reference of SurfaceControl.

SurfaceControl points to NULL when screen-on process calls destory
function, which will not be called in screen-off process. It makes
NaturalSurfaceLayout's member points to the SurfaceControl with NULL.
Crash occurs by accessing the destroyed SurfaceControl.

This CL makes the creation of SurfaceControl and NaturalSurfaceLayout
to one-to-one.

Change-Id: Ic47ea73dea67d2aba4e3e0766d1353198d7dff1d
2015-12-25 13:51:31 +09:00
Przemyslaw Szczepaniak
e69a31d750 Use HexDump instead of java.lang.IntegralToString
java.lang.IntegralToString is being removed, replaced
all its usage by com.android.internal.util.HexDump.

(cherry picked from commit 3f72604be8)

Change-Id: I0527d580f5975dca0dfaa6f86fa3695dd49d0849
2015-12-22 13:10:55 +00:00
Zoran Jovanovic
6fc42f549a Customize auto-brightness parameters
Auto-brightness parameters are device dependent so they should be
configurable.

The common issue with original values manifests as the screen being
perceived as too bright in dark rooms with minimum brightness and
also laginess on backlight change.

Change-Id: I2b040608bca73a3397c65c24d3b28a1514499ae6
2015-12-14 18:13:25 +01:00
Matthew Williams
7e4d92fbc7 Merge "ConcurrentModificationException in SyncManager" 2015-12-10 18:04:44 +00:00
振淦王
60a7431816 ConcurrentModificationException in SyncManager
updateRunningAccounts and dispatchSyncOperation is running in different thread,
and mActiveSyncContexts not synchronization.
If methods occur together,
mActiveSyncContexts change may occur when cycle is running.

Sample:
https://code.google.com/p/android/issues/detail?id=195341

Solution:
Offboard the traversal from the main thread to the handler thread.

Change-Id: Ifb9fbb466a5087186be31f7877c50b8c8b6737e4
Signed-off-by: wangzhengan <wangzglx@gmail.com>
2015-12-08 21:40:27 +08:00
Michael Wright
4d9e6190b1 Merge "Add support for locking the screen when the lid is closed"
am: 9dc3c36c9c

* commit '9dc3c36c9cd796d90b65543567495d910d266e4c':
  Add support for locking the screen when the lid is closed
2015-12-07 23:19:53 +00:00
Edward Savage-Jones
7def60daa0 Add support for locking the screen when the lid is closed
This commit adds configurable support for lockscreen
behaviour when the user has a device cover/lid.  This
is intended for lids with a viewing window so that the
user can see the time and interact with apps via the
window.

Change-Id: Id71883f66d1a180c4732912b3b59cabf9f4d7b6e
2015-12-04 18:26:31 +01:00
Phil Burk
ec719f1509 Merge "USB MIDI: Fix race condition that causes intermittent connections."
am: 1c9bdfd029

* commit '1c9bdfd0294cd1b13470ae6443bfa2ad425bd7dd':
  USB MIDI: Fix race condition that causes intermittent connections.
2015-12-04 01:18:51 +00:00
Phil Burk
1c9bdfd029 Merge "USB MIDI: Fix race condition that causes intermittent connections." 2015-12-04 01:12:01 +00:00
Phil Burk
1852019c39 USB MIDI: Fix race condition that causes intermittent connections.
Plugging in a USB MIDI device normally works.
But occasionally the device is not seen due to a race condition.
This code retries until the device is ready.

Change-Id: Ifba9c9678e6be0c3d139f3467f895307096a2ad8
Signed-off-by: Phil Burk <philburk@google.com>
2015-12-03 17:00:42 -08:00
Jeff Sharkey
678011854b Merge "Fix race condition when collecting op callback."
am: 98844a97d2

* commit '98844a97d2bd07146854783374ee3a19aed8edd5':
  Fix race condition when collecting op callback.
2015-12-03 17:03:53 +00:00
Jeff Sharkey
bc57510e9f Merge "Improved variable naming"
am: 4ef9d41066

* commit '4ef9d41066d8b4124c2c59752512adf24102634d':
  Improved variable naming
2015-12-03 17:02:21 +00:00
Jeff Sharkey
98844a97d2 Merge "Fix race condition when collecting op callback." 2015-12-03 16:58:34 +00:00
Yury Zhauniarovich
4fab7fbeb0 Improved variable naming
Variable name "appOpPerms" is substituted to "appOpPkgs", which is better
suited.

Change-Id: I038b93fdf5e539551c4aab12d9918c9937602e2d
Signed-off-by: Yury Zhauniarovich <y.zhalnerovich@gmail.com>
2015-11-25 17:53:20 +03:00
riddle_hsu
40b300fd80 Fix race condition when collecting op callback.
Other threads may change mOpModeWatchers, mPackageModeWatchers
by startWatchingMode, stopWatchingMode.

Change-Id: Id260172979ddfc2df9331880805d16ee13e183eb
2015-11-23 13:22:03 +08:00
Nicolas Geoffray
5485d81578 Merge "Remove DEBUG_JIT from Zygote flags."
am: cf49583bd0

* commit 'cf49583bd02d01b5d7aa57912d5469b466722c65':
  Remove DEBUG_JIT from Zygote flags.
2015-11-18 10:54:19 +00:00
Nicolas Geoffray
cf49583bd0 Merge "Remove DEBUG_JIT from Zygote flags." 2015-11-18 10:47:50 +00:00
Nicolas Geoffray
245ec92b65 Remove DEBUG_JIT from Zygote flags.
The flag is being obsolete by the move to JIT.

(cherry picked from commit 9abbf45c8d)

Change-Id: I3ce4577e81f91e9dd55d44116e0f9e2014bd00b8
2015-11-18 10:07:53 +00:00
Svetoslav Ganov
60cb22008c Merge "Handle renamed packages during default grants"
am: 140b101fcd

* commit '140b101fcdbdf413b914b5625b19577784ad9d88':
  Handle renamed packages during default grants
2015-11-17 20:06:21 +00:00
Svet Ganov
f443384d9e Handle renamed packages during default grants
If an L device has a privileged app on the system image which was
updated and an M OTA renames the app package (supported only for
privileged apps) we end up with a disabled system package setting
with no package information. Since we are not doing a null check
of the package we get from the disabled package settings during
default grants we crash leaving the system in a bad state.

bug:25687380

Change-Id: I4f2ebcaf471e4bd1696298eab4716b50c52ca5c4
2015-11-17 11:53:31 -08:00
Colin Cross
358ad4980f Merge "Vibra: Add loading of the vibrator hardware module."
am: 5603eca33c

* commit '5603eca33c8e322997029d3101fd2442df3c274e':
  Vibra: Add loading of the vibrator hardware module.
2015-11-17 19:51:57 +00:00
Colin Cross
5603eca33c Merge "Vibra: Add loading of the vibrator hardware module." 2015-11-17 19:31:19 +00:00
Svetoslav Ganov
57fb4bd4f7 Merge "Take into account default app for default grants"
am: 7abb36599d

* commit '7abb36599d9537296d9a51f766152025c6ed0491':
  Take into account default app for default grants
2015-11-06 00:40:48 +00:00
Svetoslav
5d05bbea5f Take into account default app for default grants
Change-Id: Ib78c7dbda65d405bbf74544cad18e5e10bfcdeec
2015-11-05 16:33:05 -08:00
Svetoslav Ganov
0c4ce4474f Merge "Revert "Take into account default app for default grants""
am: 9ae3aeec53

* commit '9ae3aeec532ce5a7908d395049efb61399875360':
  Revert "Take into account default app for default grants"
2015-11-06 00:31:13 +00:00
Svetoslav Ganov
9ae3aeec53 Merge "Revert "Take into account default app for default grants"" 2015-11-06 00:24:59 +00:00
Svetoslav Ganov
d2bbf1bf0a Revert "Take into account default app for default grants"
Apparently OEMs can set the chooser so this patch is not enough since it assumes the chooser is a platform component.

This reverts commit fce33d58d8.

Change-Id: I3b8e499d2f0a731a227d193f6c5d6ed528be2272
2015-11-06 00:24:47 +00:00
Svetoslav Ganov
0c7e9262a1 Merge "Take into account default app for default grants"
am: 82eeb2f20c

* commit '82eeb2f20c934ddc97380032b3c8ecacc21d9a04':
  Take into account default app for default grants
2015-11-05 02:25:32 +00:00
Svetoslav Ganov
a9b62e1330 Merge "Enforce weaker grant if app is default handler for miltiple action"
am: 035374d7a2

* commit '035374d7a29b4e0b0bc71bdfb3555b2e547ce1da':
  Enforce weaker grant if app is default handler for miltiple action
2015-11-05 02:23:44 +00:00
Svetoslav Ganov
82eeb2f20c Merge "Take into account default app for default grants" 2015-11-05 02:19:12 +00:00
Svetoslav
5db602fd19 Enforce weaker grant if app is default handler for miltiple action
Change-Id: Ibc46e458e277412ebb276eb5ba6f2765b6b6c5e9
2015-11-05 02:18:13 +00:00
Bill Yi
2e8c3c11b7 Merge commit 'bce5116b8d10c91436445cd0a0830bb51702bfd4' into HEAD 2015-11-03 14:29:59 -08:00
Wale Ogunwale
d89b76a58d Merge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity."
am: 7810aed854

* commit '7810aed85408bddc4cc0c65e5be8d082c638d995':
  [ActivityManager] Fix NullPointerException in startNextMatchingActivity.
2015-11-03 15:13:24 +00:00
joanne_chung
a084fb7b93 [ActivityManager] Fix NullPointerException in startNextMatchingActivity.
Symptom:
NullPointerException crash while call startNextMatchingActivity.

Root Cause:
Activity starts with FLAG_DEBUG_LOG_RESOLUTION for debug dump.
If the current Activity is the last object of resolves list,
  we can not get the next Activity and aInfo is still null.

Solution:
Check null in debug log dump.

Change-Id: I4c5d14d9acd8d47768b36c95354763841579e050
2015-11-03 11:36:41 +08:00
Svetoslav
fce33d58d8 Take into account default app for default grants
Use the correct API to query activities when granting
default permissions to ensure the preferred apps are
taken into account. This allows OEMs to customize which
app should get default permission grants if there is
more than one resolving to the query intent.

Change-Id: I047f22dfff773a2ba9de1a0144442e372607777c
2015-11-02 16:41:57 -08:00
Svetoslav Ganov
a1b8d77ca3 Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev am: 2658cb002a am: 35151fbc8b
am: 08d013d3a1

* commit '08d013d3a1e6306533c2fae1a4581986ffc9a642':
  Make SYSTEM_ALERT_WINDOW development permission
2015-10-29 01:33:09 +00:00
Svetoslav Ganov
35151fbc8b Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev
am: 2658cb002a

* commit '2658cb002abae9341c9a82bfeaed764ba5bf97c8':
  Make SYSTEM_ALERT_WINDOW development permission
2015-10-29 01:16:46 +00:00
Svetoslav Ganov
2658cb002a Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev 2015-10-29 01:10:46 +00:00
Ching Tzung Lin
a05beb29da Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev am: 36da2a208e
am: c45009906a

* commit 'c45009906ade7b25b6c01c02113c044bd9290ffb':
  Consolidates config_windowOutsetBottom and circular_display_mask_offset
2015-10-28 17:41:24 +00:00
Ching Tzung Lin
36da2a208e Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev 2015-10-28 17:25:24 +00:00
Svetoslav
01af6a42a6 Make SYSTEM_ALERT_WINDOW development permission
bug:25329324

Change-Id: I0086464846bab9424764dd0d726692d96a0f1207
2015-10-27 18:12:06 -07:00
Dianne Hackborn
24f2cca6ed Fix issue #25289999: Lower device idle alarm limit to 10 mins. am: 7682b26ea1 am: 26654c92ca
am: 40bced1d6e

* commit '40bced1d6ed2dadbd1fff116dad382582c430297':
  Fix issue #25289999: Lower device idle alarm limit to 10 mins.
2015-10-27 20:04:49 +00:00
Dianne Hackborn
26654c92ca Fix issue #25289999: Lower device idle alarm limit to 10 mins.
am: 7682b26ea1

* commit '7682b26ea164ba1078495e24910f22d73766c192':
  Fix issue #25289999: Lower device idle alarm limit to 10 mins.
2015-10-27 19:46:12 +00:00
Dianne Hackborn
7682b26ea1 Fix issue #25289999: Lower device idle alarm limit to 10 mins.
This helps with some cases where perisistent network connections
need a more frequent keep alive signal.  Actually make it 9
minutes to ensure that things needing a 10 minute cycle will
execute within that time.

Change-Id: Ife8c7b7f7f82b108d5a6c1624bd6115e6087c3be
2015-10-27 10:23:38 -07:00