21625 Commits

Author SHA1 Message Date
Jinsuk Kim
5304649ba8 am 2cd3ac47: Merge "CEC: Support sendStandby() for MHL device" into lmp-mr1-dev
* commit '2cd3ac4707f32fc296c0b2a8e7e2479d40c9a706':
  CEC: Support sendStandby() for MHL device
2015-01-15 05:11:49 +00:00
Jinsuk Kim
2cd3ac4707 Merge "CEC: Support sendStandby() for MHL device" into lmp-mr1-dev 2015-01-15 05:07:04 +00:00
Jinsuk Kim
61c94d1a03 CEC: Support sendStandby() for MHL device
Changed so that the API sendStandby() transform the request to
a MHL subcommand if the call is done against a MHL device.

Also hooked up the dump() to print out information on MHL.

Bug: 18451257
Change-Id: I1927855e0e4c45a731f0fd97ba572bfc2a894557
2015-01-15 07:12:50 +09:00
Michael Wright
5497e99c4a am eec75faa: Merge "Clean up graphics resources." into lmp-mr1-dev
* commit 'eec75faaa25b5da3382cf0925a65e9e6bd90fdc9':
  Clean up graphics resources.
2015-01-14 21:26:52 +00:00
Michael Wright
eec75faaa2 Merge "Clean up graphics resources." into lmp-mr1-dev 2015-01-14 21:21:40 +00:00
Craig Mautner
f387d3c87a am c8ba2e87: Merge "Place window at top when adding by base layer" into lmp-mr1-dev
* commit 'c8ba2e87a40eb70ad22c62b9768e7691e3ff3bc3':
  Place window at top when adding by base layer
2015-01-14 20:52:23 +00:00
Craig Mautner
c8ba2e87a4 Merge "Place window at top when adding by base layer" into lmp-mr1-dev 2015-01-14 20:46:23 +00:00
Craig Mautner
cfb13798db Place window at top when adding by base layer
When addAppWindowToListLocked defaults to adding based on mBaseLayer
it went from the lowest window to the highest window looking for a
window whose base layer was larger and dropping the new window below
that window.

If the Home activity is the InputMethodTarget then when the home
ActivityStack moves to the back the InputMethod will follow. This
puts the InputMethod, with it's high base layer value below most
activities. If a new activity window is added using the mBaseLayer
rule above it was placed at the bottom of the window list below the
InputMethod window. Being at the bottom it never received focus and
input to the activity timed out causing ANR.

This change starts the mBaseLayer search at the top window and works
its way down looking for the first window whose mBaseLayer is less
than or equal to the new window's mBaseLayer and inserting the new
window above that window. This causes it to be placed at the top of
all activities even if the InputMethod is near the bottom.

Fixes bug 17721767.

Change-Id: I037064de7604b670841e985479eb5857b47af1d7
2015-01-14 12:20:35 -08:00
Paul Jensen
be61ffa4fe am 9f0e9ad4: Merge "Don\'t blindly teardown unvalidated networks when releasing NetworkRequests." into lmp-mr1-dev
* commit '9f0e9ad40633f0480c8b6209e52d61c5aac52d1d':
  Don't blindly teardown unvalidated networks when releasing NetworkRequests.
2015-01-14 12:42:32 +00:00
Paul Jensen
9f0e9ad406 Merge "Don't blindly teardown unvalidated networks when releasing NetworkRequests." into lmp-mr1-dev 2015-01-14 12:39:01 +00:00
Lorenzo Colitti
792fd3d1ee am 2b52cad1: Merge "Switch the connectivity check to its own hostname." into lmp-mr1-dev
* commit '2b52cad12e371a173b61257599824934b1a6c930':
  Switch the connectivity check to its own hostname.
2015-01-14 11:59:46 +00:00
Lorenzo Colitti
2b52cad12e Merge "Switch the connectivity check to its own hostname." into lmp-mr1-dev 2015-01-14 10:28:26 +00:00
Justin Harrison
561cf95955 am 82008858: Merge "Fix unexpected language changes on SIM card insertion." into lmp-mr1-dev
* commit '820088587e732fe04b705248a06f275bf264be33':
  Fix unexpected language changes on SIM card insertion.
2015-01-13 23:15:14 +00:00
Fyodor Kupolov
562e87bdd5 am 207d7bd3: Merge "Run isKeyguardSecure under system privileges" into lmp-mr1-dev
* commit '207d7bd3a4aca3478910ec740a0c810868fbeabb':
  Run isKeyguardSecure under system privileges
2015-01-13 23:14:58 +00:00
Lorenzo Colitti
cd29cb66f9 Switch the connectivity check to its own hostname.
Bug: 18467482
Bug: 18869302
Bug: 18924197
Change-Id: I1de478e9c8a165faf6f1bf81e042d1de9e03c3d5
2015-01-14 08:06:56 +09:00
Justin Harrison
820088587e Merge "Fix unexpected language changes on SIM card insertion." into lmp-mr1-dev 2015-01-13 23:01:39 +00:00
Fyodor Kupolov
207d7bd3a4 Merge "Run isKeyguardSecure under system privileges" into lmp-mr1-dev 2015-01-13 22:19:26 +00:00
Craig Mautner
82da2ee927 am ef04ae79: Merge "Complete booting when frontmost activity is idle" into lmp-mr1-dev
* commit 'ef04ae79af58cc86c4312fac18c8a4eb24fc73ae':
  Complete booting when frontmost activity is idle
2015-01-13 21:34:32 +00:00
Craig Mautner
0f6da477cb am 31ae1730: Merge "Add debug for ANR" into lmp-mr1-dev
* commit '31ae17309e8c79c4b1a7b63a9c4bb43ae0849de2':
  Add debug for ANR
2015-01-13 21:34:27 +00:00
Craig Mautner
ef04ae79af Merge "Complete booting when frontmost activity is idle" into lmp-mr1-dev 2015-01-13 21:28:37 +00:00
Craig Mautner
bcb6eb9e26 Add debug for ANR
Help for bug 17721767.

Change-Id: If863f3e6536be8af2c189dcc37d503c4d6b663b4
2015-01-13 13:24:17 -08:00
Craig Mautner
f3ea23ad9b Complete booting when frontmost activity is idle
The boot process is intended to complete when the frontmost activity
becomes idle. This change fixes a corner case where the system was
booting and the Home activity became idle when it was not at the
front causing the system to never complete booting.

Before ag/603303 a secondary stack was created for the TaskPersister
at the beginning of activity manager systemReady(). Following that
change the secondary stack was created for the first time when a task
was restored from system ui recents when getTaskThumbnail() was
called. At the time it was created it was also moved to the front of
the stack order.

If that stack creation happens to occur after the Home activity is
started but before the Home activity becomes idle then the new stack
will obscure the Home activity and the boot process does not
complete.

1. This change adds a test for an idle activity coming to the front
when a stack is moving to the front and we haven't completed booting
yet. If this situation is detected the boot sequence is then
completed.

2. This change fixes the stack ordering so that creating a new task
when restoring recents does not automatically move the stack to the
front.

Fixes bug 18949470.

Change-Id: I243f0bb4396b518a0a8835c0c7bdccb2581a3520
2015-01-13 11:27:30 -08:00
Wink Saville
6a903c31fe am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev
* commit '84c5e8ebf0185ca65d4bab148f6d72d71940aba8':
  Rename reg/unreg OnSubscriptionsChangedListener.
2015-01-13 19:09:48 +00:00
Fyodor Kupolov
c87d162815 Run isKeyguardSecure under system privileges
In certain cases, isKeyguardSecure calls UserManager.getProfileParent, which
requires MANAGE_USERS permission.
Now the check is done under system privileges.

Bug:18765066
Change-Id: I6b23aedee06403d36523af5fee9c7db9659284b3
2015-01-13 11:06:04 -08:00
Wink Saville
071743f0cb Rename reg/unreg OnSubscriptionsChangedListener.
To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.

Bug: 18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
2015-01-13 08:36:24 -08:00
Narayan Kamath
c63a16b8e4 Fix unexpected language changes on SIM card insertion.
There are two separate issues here that need to be fixed, both
boil down to the fact that adding an imperative (userSetLocale)
to the Configuration is a bad idea. Because of this:

- We'd never persist the first user set configuration if it was en_US,
  because of an erroneous call to Configuration.setLocale.

- ActivityManager.getConfiguration would sometimes return a
  Configuration with userSetLocale == true, which means callers with
  the right permissions would inadvertently persist a locale they didn't
  want to persist.

bug: 18879010

Change-Id: Id330ffde9d2a6e516fd60edc33f5529df719c634
2015-01-13 16:27:17 +00:00
Paul Jensen
9936484667 Don't blindly teardown unvalidated networks when releasing NetworkRequests.
These networks may be on their way to becoming validated at which point
they could satisfy the default NetworkRequest.  This change unifies the
is-this-network-needed code into a single function.

bug:18652378
Change-Id: Ia511d5c66be79b47dd7c9348ec02784ab30b960c
2015-01-13 09:05:38 -05:00
Michael Wright
2ed0513f20 Clean up graphics resources.
Release SurfaceTexture after use in ColorFade and delete GL resources
in ImageWallpaper.

Bug: 17871993
Change-Id: I05bda03657ca502ba35b7187b6f361018f7ef687
2015-01-12 15:31:02 -08:00
Prashant Malani
4212bf1fad am b71f9f96: Merge "Improve the circularMask for round displays" into lmp-mr1-dev
* commit 'b71f9f96f7f464267c59a80add495388338ced04':
  Improve the circularMask for round displays
2015-01-12 18:40:56 +00:00
Prashant Malani
b71f9f96f7 Merge "Improve the circularMask for round displays" into lmp-mr1-dev 2015-01-12 18:34:46 +00:00
Jinsuk Kim
258b941890 am f94d5d26: Merge "CEC: Keep Playback device awake while it is the active source" into lmp-mr1-dev
* commit 'f94d5d26f2d122cbb41327d8e34d8655514f9b0c':
  CEC: Keep Playback device awake while it is the active source
2015-01-10 22:04:27 +00:00
Jinsuk Kim
f94d5d26f2 Merge "CEC: Keep Playback device awake while it is the active source" into lmp-mr1-dev 2015-01-10 21:59:40 +00:00
Paul Jensen
63e2b8e058 am 60944390: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev
* commit '60944390cde10c44064f1eda67eae5d76598f0d8':
  Remember to cancel lingering when a network again satsifies a NetworkRequest.
2015-01-10 02:06:06 +00:00
Paul Jensen
60944390cd Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev 2015-01-10 01:59:45 +00:00
Dianne Hackborn
a319aa800d Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev
automerge: 54f9b1e

* commit '54f9b1eedc86a3066bedf3d8ea3e8ffbb83cb678':
  Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi
2015-01-09 19:11:44 +00:00
Dianne Hackborn
54f9b1eedc Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev 2015-01-09 19:08:50 +00:00
Prashant Malani
ea481beda6 Improve the circularMask for round displays
The mask was earlier drawn as a thin ring at the display periphery.
This had undesirable effects when screenshots were taken, as the ring
was seen, as well as display content beyond it.

This patch modifies the mask to be a black canvas with portions erased
to improve the screenshot image.

Bug: 18772987
Change-Id: I25ef6387879613354308e015446fe325ed8c4515
2015-01-09 11:07:03 -08:00
Ariel Gertzenstein
b32831eebf Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524" into lmp-mr1-dev
automerge: cce8db2

* commit 'cce8db2c31a03d0c4e04f5851415d37032ae6621':
  Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524
2015-01-09 17:59:15 +00:00
Ariel Gertzenstein
cce8db2c31 Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524" into lmp-mr1-dev 2015-01-09 17:56:11 +00:00
Dianne Hackborn
b3d4cb369e Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi
FastPrintWriter needs to have its own lock for each instance, or
else one getting blocked can cause others to block and whacky deadlocks
result.

Also:

- Improve error reporting of SystemConfig to tell you which config
  file is the problem.
- Fix CoreSettingsProvider to not spew errors if a setting is not
  defined (it should just use a default value).
- Get rid of noisy init output of ConditionProviders.
- Reduce log noise of starting a process; move some of that information
  to ProcessRecord to print on demand.

Change-Id: I1032d141ddd449968b74ab7b88ab36f2d228ad1a
2015-01-09 09:54:06 -08:00
Ariel Gertzenstein
2999acb0ce Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524
This reverts commit bde7bc45af2bb7f9bee8096d45973f25cc00c5db.

Change-Id: I1a0bcd1c2e0d4ade7efa980edd2105408bb48991
2015-01-09 17:45:40 +00:00
Robin Lee
34f3adedcc am 7f7ea82c: Profile owner hint in warning for extra CAs
* commit '7f7ea82c28f01798b15686aa45733885beebcc6e':
  Profile owner hint in warning for extra CAs
2015-01-09 15:12:24 +00:00
Robin Lee
7f7ea82c28 Profile owner hint in warning for extra CAs
The version of the warning with a named installer should be shown in
the case of a managed profile, not only a managed device.

Bug: 18224038
Change-Id: I27865f77e963b9b15416f2e4a4ffc38fed8f5532
2015-01-09 11:25:04 +00:00
Jinsuk Kim
e26d833c4a CEC: Keep Playback device awake while it is the active source
Alleviates the user experience issue of having to turn on the device
manually when it goes to standby mode while the device occupies
the display.

Bug: 18882764
Change-Id: I10b239a599a310e47e3c2cb98737e4b0fdb4e435
2015-01-09 15:07:39 +09:00
Shishir Agrawal
2db79771b6 am bde7bc45: GpsLocationProvider: Read data enabled status from TelephonyManager.
* commit 'bde7bc45af2bb7f9bee8096d45973f25cc00c5db':
  GpsLocationProvider: Read data enabled status from TelephonyManager.
2015-01-09 01:35:16 +00:00
Shishir Agrawal
bde7bc45af GpsLocationProvider: Read data enabled status from TelephonyManager.
Bug: 18814559
Change-Id: Ie8edde652565aca2e2a1935ed42eb927b7d26baa
2015-01-08 16:04:24 -08:00
Robin Lee
bc7efed694 am 2cc617b2: Merge "Revert "Profile owner hint in warning for extra CAs"" into lmp-mr1-dev
* commit '2cc617b2adcd3c54837a251b688e909e3224a5e4':
  Revert "Profile owner hint in warning for extra CAs"
2015-01-08 22:38:22 +00:00
Robin Lee
2cc617b2ad Merge "Revert "Profile owner hint in warning for extra CAs"" into lmp-mr1-dev 2015-01-08 22:31:36 +00:00
Robin Lee
e53b7dd066 Revert "Profile owner hint in warning for extra CAs"
This reverts commit e1d8dcd9e170c1ed8a13b6e1256ea1fb22c26c49.

Something funny happened in the process of submitting this,
swathes of strings.xml became mis-encoded.

Bug: 18224038
Change-Id: I0276ff3f880fe749546e8cc7e3e2f41c22c27705
2015-01-08 22:08:42 +00:00
Dianne Hackborn
16e4324dd9 am cb8d8e10: Merge "Fix issue #18827122: system server crashed on broadcasting..." into lmp-mr1-dev
* commit 'cb8d8e10b0c1163914aca85f8e3b73a0cac86fb4':
  Fix issue #18827122: system server crashed on broadcasting...
2015-01-08 21:46:53 +00:00