drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
150,275 Commits 1 Branch 0 Tags
Commit Graph

3057 Commits

Author SHA1 Message Date
Dianne Hackborn
fc9eebe397 am 9f886b5d: am b344c188: Merge "Fix singleInstance usage when singleTop intended" into lmp-dev 
* commit '9f886b5d24b02978f56abe777819665d4eea4fbc':
  Fix singleInstance usage when singleTop intended
 2014-08-14 17:46:46 +00:00
Wonsik Kim
2c8d0d15fb am a4f76c98: am 21cdf598: Merge "TIF: handle HDMI CEC power status change" into lmp-dev 
* commit 'a4f76c98e66b1d1d45a57f88fffc75e63c3774c3':
  TIF: handle HDMI CEC power status change
 2014-08-14 17:46:37 +00:00
Robert Greenwalt
2f0faca669 am 9249840f: am eb2f9858: Merge "Don\'t send NetworkMonitor bcast until systemReady" into lmp-dev 
* commit '9249840f7f5939d7f5efa233c1ef9f8ee57a57f7':
  Don't send NetworkMonitor bcast until systemReady
 2014-08-14 17:45:31 +00:00
Winson Chung
110d2ccdb8 am e53ad496: am 11d62d14: Merge "Adding scrim to task views. (Bug 15704955)" into lmp-dev 
* commit 'e53ad496018d28cfb625eaec8c7ccbc1edae0581':
  Adding scrim to task views. (Bug 15704955)
 2014-08-14 17:45:23 +00:00
Dianne Hackborn
5b1500a7dc Merge "Fix singleInstance usage when singleTop intended" into lmp-dev 2014-08-14 00:12:29 +00:00
Craig Mautner
ad400af809 Fix singleInstance usage when singleTop intended 
In ag/499591 launchSingleInstance was mistakenly used to replace
r.launchMode==ActivityInfo.LAUNCH_SINGLE_TOP. This fixes that
and...

fixes bug 16898764.

Change-Id: I0c0cc3b67eda69276dbe1dd5da4f17556651b1ff
 2014-08-13 17:17:21 -07:00
Robert Greenwalt
57e383b1cc Merge "Don't send NetworkMonitor bcast until systemReady" into lmp-dev 2014-08-13 23:16:37 +00:00
Robert Greenwalt
fb68f8fbe0 Don't send NetworkMonitor bcast until systemReady 
bug:16913951
Change-Id: I26c5c3353c2d8821452f81765875958d5b9d385b
 2014-08-13 13:43:32 -07:00
Jae Seo
6b8ea6e56d am 930ab23a: am 7d206d9b: Merge "TIF: Create TvInputState only once per each input" into lmp-dev 
* commit '930ab23aaf41163f09a83a3060e1f1b78cb5af0c':
  TIF: Create TvInputState only once per each input
 2014-08-13 20:24:16 +00:00
Amith Yamasani
b0dd621ef3 am 6648994f: am 5884bca0: Decouple user limit from guest creation 
* commit '6648994f02769f957a197deef011291d11a390b8':
  Decouple user limit from guest creation
 2014-08-13 20:18:50 +00:00
Amith Yamasani
95ab784944 Decouple user limit from guest creation 
Allow Guest to be created even if there are N users.
Allow N users to be created even if there are N-1 users
   and a Guest.
Limit number of guests and managed profiles that can
be added.

Added unit tests.

Bug: 15934700
Change-Id: I1a8f0fa38a91d71ef7b2980e05c974244dfc337a
 2014-08-13 20:09:20 +00:00
keunyoung
fa4c60cf63 am a90c8cba: am 64c0b0b6: Merge "rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP" into lmp-dev 
* commit 'a90c8cba81ab4721e4d440d4ddd0a9710bf62def':
  rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP
 2014-08-13 20:00:50 +00:00
Adrian Roos
02bb98b3b2 am df08e58a: am d63b258c: Trust: Insecure unlock also removes disable-trust-on-boot restriction 
* commit 'df08e58a28a604e29ad4e0cb81d0d7f2aadaa048':
  Trust: Insecure unlock also removes disable-trust-on-boot restriction
 2014-08-13 19:40:49 +00:00
Adrian Roos
9dbe190099 Trust: Insecure unlock also removes disable-trust-on-boot restriction 
Bug: 16485702
Change-Id: I437f619eb680fa9461a5e0d854db2d9f84dc602c
 2014-08-13 19:31:29 +00:00
Craig Mautner
fb16732623 am 72115915: am 3e8ccb9c: Clean up app following death when creating service 
* commit '721159159f1c0e100150512c392141830eaebba2':
  Clean up app following death when creating service
 2014-08-13 18:27:54 +00:00
Craig Mautner
bf159f9de5 am 3f4a10a5: am 8844c75a: Merge "Disassociate system windows from apps" into lmp-dev 
* commit '3f4a10a5eac64960bbae4af2b1f44cdc0d5309c3':
  Disassociate system windows from apps
 2014-08-13 18:27:43 +00:00
Craig Mautner
4a8dddbf18 Clean up app following death when creating service 
If an app has died, run through the cleanup before relaunching its
service.

Also a little simplifying refactor.

Fixes bug 16979752.

Change-Id: I376cbef2ea00fc626588386317f092cc6dea0bdc
 2014-08-13 18:15:28 +00:00
destradaa
fa3f594bda am 84e1d77c: am fa0ddb7b: Merge "Update FlpHardwareProvider native layer, to stop raising FatalErrors." into lmp-dev 
* commit '84e1d77cc8ec8ad1c8f2c6f07eeeb1f1ff62da27':
  Update FlpHardwareProvider native layer, to stop raising FatalErrors.
 2014-08-13 18:03:53 +00:00
Adrian Roos
a42bf4c31b am 38afacab: am 6b3fc443: Dismiss bouncer when onTrustInitiatedByUser fires 
* commit '38afacabc5ee4fb29e6d1271643dc0f76fbae94b':
  Dismiss bouncer when onTrustInitiatedByUser fires
 2014-08-13 17:33:13 +00:00
Adrian Roos
2bb8bfd1e8 Dismiss bouncer when onTrustInitiatedByUser fires 
Also modifies the SampleTrustAgent to allow testing of the feature
and adds the initiatedByUser flag to the dumpsys output.

Bug: 16840500
Change-Id: I4c08ddcdcbd0ab02c694a1873f73cb9a250f98d7
 2014-08-13 17:24:36 +00:00
destradaa
2abc32c18b am d5f85ed7: am 02281fbb: Merge "Add additional logging around AGPS IP Address handling." into lmp-dev 
* commit 'd5f85ed7a6e2dafe8f3fafed3b779515915c39ad':
  Add additional logging around AGPS IP Address handling.
 2014-08-13 17:17:07 +00:00
Jae Seo
67241476f3 Merge "TIF: Create TvInputState only once per each input" into lmp-dev 2014-08-13 16:52:03 +00:00
Jae Seo
9cc28e5175 TIF: Create TvInputState only once per each input 
Also removed mClientTokens which is no longer used.

Bug: 16970763
Change-Id: I4fc276241c33f88ed932ce6c703bdb3f771eb7d4
 2014-08-13 11:06:53 -07:00
Jean-Michel Trivi
114e293143 am 94dc549b: am f181197f: Merge "Add support for AudioAttributes in android.media.Ringtone" into lmp-dev 
* commit '94dc549b6fe45fd4bde0bedf035fb34eb4b797b8':
  Add support for AudioAttributes in android.media.Ringtone
 2014-08-13 16:07:32 +00:00
John Spurlock
401851159c am 5f5a53d4: am f69796cf: Merge "Send LED signal up to SystemUI regardless of setting." into lmp-dev 
* commit '5f5a53d4ef5ae248814df733dc32f24f80530f33':
  Send LED signal up to SystemUI regardless of setting.
 2014-08-13 15:19:54 +00:00
Jorim Jaggi
728f39f578 am 119b3c40: am 36abea42: Merge "Lockscreen launch animations" into lmp-dev 
* commit '119b3c40078d532dce4b1de56f4645b6ea587874':
  Lockscreen launch animations
 2014-08-13 14:13:41 +00:00
Narayan Kamath
1c002e9f50 am 8a4c1f74: am a76f47ee: Persist the cpuAbiOverride setting. 
* commit '8a4c1f74b4032613807bf4589430acdfc0f2e535':
  Persist the cpuAbiOverride setting.
 2014-08-13 11:52:54 +00:00
Narayan Kamath
4903f64ba2 Persist the cpuAbiOverride setting. 
If an app is installed with an ABI override (adb install -r --abi)
we should remember this so that we don't revert to the scan derived
ABI on the next reboot.

bug: 16476618

Change-Id: I6085bc0099eb613dd9d3b07113c7c13859780697
 2014-08-13 12:41:19 +01:00
Narayan Kamath
2c76715154 am 1c2b4c39: am 5d171a2b: Fix a couple of PM warnings. 
* commit '1c2b4c39b4a7718b95b13f69ec848479ab5200d7':
  Fix a couple of PM warnings.
 2014-08-13 11:15:24 +00:00
Narayan Kamath
20200849d1 Fix a couple of PM warnings. 
- "Could not delete native binary" : This one is a bit of
  a WTF. git history tells us this code has been around for
  a very long time (the warning's new though). It's a no-op
  because codePath always contains the *current* codePath and
  trying to remove native libs from the current codePath will
  do nothing for bundled apps. This code sounds like it wants
  to delete dangling native binaries for system apps that were
  upgraded during an OTA. This sounds like a wrong place to do
  that, though.

- "Unrecognized code path" : This one's harmless and removed
  by moving this call closer to where it's used.

bug: 16823001

Change-Id: I9b40ae507b2c80ff3fdd45d5699df62bfc86514f
 2014-08-13 11:05:58 +00:00
Alexandra Gherghina
fc2abe8626 am 25332ad5: am af9c6d08: Merge "Bugfix: adds extra null check" into lmp-dev 
* commit '25332ad5664112e10b71265fe5b6ebeb590e1dce':
  Bugfix: adds extra null check
 2014-08-13 10:04:07 +00:00
Ji-Hwan Lee
e42b655a71 am f7b5efc1: am 88d355e7: Merge "TIF: Fix release logic for hardware wrapper input" into lmp-dev 
* commit 'f7b5efc1293079e7d85aaf6f1720903558cea86f':
  TIF: Fix release logic for hardware wrapper input
 2014-08-13 06:51:27 +00:00
Wonsik Kim
927e31e1a3 am 0cb41226: am 78ed5c9d: Merge "TIF: fix parental control data inconsistency" into lmp-dev 
* commit '0cb41226ef116ee81e38984181edd1b13316c6c6':
  TIF: fix parental control data inconsistency
 2014-08-13 05:54:57 +00:00
Yuncheol Heo
7dc08e873c am df4c5298: am 09f15570: Merge "Implement MHL RAP reception." into lmp-dev 
* commit 'df4c5298f780181768eb916df9fa23d2d145a078':
  Implement MHL RAP reception.
 2014-08-13 04:26:23 +00:00
keunyoung
fd740ec78b am eef45610: am 435edc40: fix wrong flag check for virtual display 
* commit 'eef45610fca1078167b68f722abddb7435f05913':
  fix wrong flag check for virtual display
 2014-08-13 04:26:10 +00:00
Jae Seo
fe90d78e54 am 3f96209d: am bb1586c1: Merge "TIF: Temporarily disable permission check for parental controls" into lmp-dev 
* commit '3f96209d8791524f1d5df8ae23fffaeaa8725c47':
  TIF: Temporarily disable permission check for parental controls
 2014-08-13 04:26:04 +00:00
Jinsuk Kim
3ca0fb8e1d am ecfcfcea: am 4fec909c: CEC: Remove timeout from deviceSelect processing 
* commit 'ecfcfceae31261a478162f935ce350ba724fb74d':
  CEC: Remove timeout from deviceSelect processing
 2014-08-13 04:25:57 +00:00
keunyoung
48054241eb fix wrong flag check for virtual display 
- FLAG_NEVER_BLANK was always set for non-public display

bug: 16958538
Change-Id: Ia147ac3ca39d687e60ec4b77726f6b6e4c3aeb3b
 2014-08-13 01:14:19 +00:00
Jinsuk Kim
8e083ec044 CEC: Remove timeout from deviceSelect processing 
20-second timeout set for incoming <active source> command after
<set stream path> is moved out of HdmiControlService, to
HDMI input service.

Bug: 16967429
Change-Id: I5b50b0187e562b51e227a29e54824740ca37906e
 2014-08-13 00:53:28 +00:00
David Christie
b09901f6f9 am eb8d2a14: am c098598e: Disable GPS when battery saver is on and screen is off. Bug: 15348895 
* commit 'eb8d2a144be7b222b7e7f34f9e5cb4d7ff678a85':
  Disable GPS when battery saver is on and screen is off. Bug: 15348895
 2014-08-12 23:41:03 +00:00
Winson Chung
eb0cefa965 Merge "Adding scrim to task views. (Bug 15704955)" into lmp-dev 2014-08-12 23:14:48 +00:00
Winson Chung
60a729c8e9 Adding scrim to task views. (Bug 15704955) 
- Fixing issue with focus animations not happening for new views

Change-Id: I3134f25becf06db343aa30ea80cb33514cd99d06
 2014-08-13 15:55:15 -07:00
John Spurlock
55b0abd75c Merge "Send LED signal up to SystemUI regardless of setting." into lmp-dev 2014-08-12 23:14:48 +00:00
John Spurlock
3929232cf9 Send LED signal up to SystemUI regardless of setting. 
Let it make an independent decision about whether or not to
do anything with it.

Bug:17001245
Change-Id: Ie494abec423f3620bf142ad332bb5f0a4d4341a5
 2014-08-13 11:00:59 -04:00
Jorim Jaggi
72eb2ae21b Merge "Lockscreen launch animations" into lmp-dev 2014-08-12 23:14:48 +00:00
Alexandra Gherghina
7f8821c5a2 Merge "Bugfix: adds extra null check" into lmp-dev 2014-08-12 23:14:48 +00:00
Ji-Hwan Lee
0c38fc764b TIF: Fix release logic for hardware wrapper input 
Change-Id: I7aad26682738e7a20bc6a053c3827ab79e83e925
 2014-08-13 15:41:20 +09:00
Wonsik Kim
dd8e48f306 Merge "TIF: fix parental control data inconsistency" into lmp-dev 2014-08-12 23:14:48 +00:00
Wonsik Kim
276ec84b5d TIF: fix parental control data inconsistency 
Bug: 16987144
Change-Id: I43cc7de92663d50073d5c4da1dbffe4e9a2b26a6
 2014-08-13 14:34:28 +09:00
Wonsik Kim
592ddc3f6e Merge "TIF: handle HDMI CEC power status change" into lmp-dev 2014-08-12 23:14:42 +00:00