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

28441 Commits

Author SHA1 Message Date
Adrian Roos
aebb144b3c am e674e950: am 9fb98375: am b30f841c: resolved conflicts for merge of c1244a29 to mnc-dr-dev 
* commit 'e674e9500c723848e896d281fc4bf45285689170':
  Touch, wake and unlock
 2015-07-23 21:48:42 +00:00
Adrian Roos
9fb98375e8 am b30f841c: resolved conflicts for merge of c1244a29 to mnc-dr-dev 
* commit 'b30f841cb44e132598939b0797dad41f6c0004a7':
  Touch, wake and unlock
 2015-07-23 19:20:22 +00:00
Adrian Roos
b30f841cb4 resolved conflicts for merge of c1244a29 to mnc-dr-dev 
Change-Id: I8b3e3a21e36ac5085bf1dffa90e49dabd17dd139
 2015-07-22 12:00:56 -07:00
Jeff Sharkey
426020b80d am b109b134: am 934995ed: am b020b0d9: am cf051d18: Merge "Avoid NPE when no staged installs." into mnc-dev 
* commit 'b109b1349a50e14ab52d013e6d5dde5db3d7ab67':
  Avoid NPE when no staged installs.
 2015-07-21 23:57:58 +00:00
Jorim Jaggi
c1244a2995 Merge "Touch, wake and unlock" into mnc-dev 2015-07-21 21:53:11 +00:00
Jeff Sharkey
934995ede4 am b020b0d9: am cf051d18: Merge "Avoid NPE when no staged installs." into mnc-dev 
* commit 'b020b0d97d80f0ebb550ce58a5b36787cfcf6df8':
  Avoid NPE when no staged installs.
 2015-07-21 21:52:57 +00:00
Jeff Sharkey
b020b0d97d am cf051d18: Merge "Avoid NPE when no staged installs." into mnc-dev 
* commit 'cf051d1846c347413d8c907b42f3fce74795a815':
  Avoid NPE when no staged installs.
 2015-07-21 21:36:56 +00:00
Jeff Sharkey
cf051d1846 Merge "Avoid NPE when no staged installs." into mnc-dev 2015-07-21 21:23:59 +00:00
Amith Yamasani
f8db3c6498 am aef8716e: am b82c71a8: am 89d4131d: am 09ba7151: Merge "Don\'t kill apps that are multi-user aware..." into mnc-dev 
* commit 'aef8716ed92a69322cd84836e45f320f10cc22e3':
  Don't kill apps that are multi-user aware...
 2015-07-21 21:02:34 +00:00
Amith Yamasani
b82c71a893 am 89d4131d: am 09ba7151: Merge "Don\'t kill apps that are multi-user aware..." into mnc-dev 
* commit '89d4131d75cc4c89e3fb36115be929837c9a3171':
  Don't kill apps that are multi-user aware...
 2015-07-21 20:33:07 +00:00
Amith Yamasani
89d4131d75 am 09ba7151: Merge "Don\'t kill apps that are multi-user aware..." into mnc-dev 
* commit '09ba71513ba3bb092eb3effbe45953c50430ff20':
  Don't kill apps that are multi-user aware...
 2015-07-21 20:18:02 +00:00
Amith Yamasani
09ba71513b Merge "Don't kill apps that are multi-user aware..." into mnc-dev 2015-07-21 20:04:22 +00:00
Amith Yamasani
c1cbaaba6c Don't kill apps that are multi-user aware... 
... when looking for background user apps that hold RECORD_AUDIO
permission.

On switching users, we kill any apps that might potentially be
recording audio. But we don't want to kill critical apps that need
to stay running because of multi-user aware services.

Bug: 22564430
Change-Id: I6d9a684d4e044cc3018f0f8181a44aa143a3baeb
 2015-07-21 11:46:14 -07:00
Nick Kralevich
b430c4f06c am 8326ebbe: am 6b04e5b8: am 894ffd10: am 673ccfd4: Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev 
* commit '8326ebbe9ea324cc7608e8dc754a63d905bfdb63':
  UsbDeviceManager: add back support for USB overlays
 2015-07-21 18:07:11 +00:00
Nick Kralevich
6b04e5b803 am 894ffd10: am 673ccfd4: Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev 
* commit '894ffd102d90a7c794e5c522818f163b92baa55d':
  UsbDeviceManager: add back support for USB overlays
 2015-07-21 17:38:50 +00:00
Nick Kralevich
894ffd102d am 673ccfd4: Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev 
* commit '673ccfd45a81482d97eecf76dc0fef0dfd57be73':
  UsbDeviceManager: add back support for USB overlays
 2015-07-21 17:25:30 +00:00
Nick Kralevich
673ccfd45a Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev 2015-07-21 17:16:10 +00:00
Wale Ogunwale
013869253e am f2f29dc4: am 18c87a1e: am 7dcad6a5: am e99f20f5: Merge "Don\'t duplicate recent tasks of the same affinity." into mnc-dev 
* commit 'f2f29dc4add3943eb4f0b06a5c748b99664212da':
  Don't duplicate recent tasks of the same affinity.
 2015-07-21 15:24:00 +00:00
Wale Ogunwale
18c87a1eb8 am 7dcad6a5: am e99f20f5: Merge "Don\'t duplicate recent tasks of the same affinity." into mnc-dev 
* commit '7dcad6a5d426e1a243e36cbd084c60bc8038c56b':
  Don't duplicate recent tasks of the same affinity.
 2015-07-21 14:52:05 +00:00
Wale Ogunwale
7dcad6a5d4 am e99f20f5: Merge "Don\'t duplicate recent tasks of the same affinity." into mnc-dev 
* commit 'e99f20f5873c00b35f2407e28e06ff9119f85088':
  Don't duplicate recent tasks of the same affinity.
 2015-07-21 14:38:04 +00:00
Wale Ogunwale
e99f20f587 Merge "Don't duplicate recent tasks of the same affinity." into mnc-dev 2015-07-21 14:28:16 +00:00
Wale Ogunwale
7cbfcd8865 Don't duplicate recent tasks of the same affinity. 
In change 510e554283d3dc250f836cd3e4abc36d87319333 we stated
limiting the number of document activity entries in recents
by comparing the realActivity of the tasks. This compared was
done for all tasks not just document tasks there by breaking
the use of task affinity to remove tasks with the same affinity
from recent task list. This change limits the compare of
realActivity to just document tasks.

Bug: 22564474
Bug: 18642190
Change-Id: Idc21ec311f194ab2005cb22380ca56303ae0ad94
 2015-07-21 07:26:36 -07:00
Jae Seo
3f56fb94b1 am 12d1db7d: am 6ff64bc3: am 6564934d: am b2eed1d6: Merge "TIF: Get or create the user state when failed to find existing one" into mnc-dev 
* commit '12d1db7d27553b0d02afe43937679cc1e6139ba1':
  TIF: Get or create the user state when failed to find existing one
 2015-07-21 01:00:14 +00:00
Dongwon Kang
0294448c19 am fe207d3d: am e64dfb47: am 14bdaa7f: am 6444fe12: Merge "MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive" into mnc-dev 
* commit 'fe207d3dee5bf392ddd6ea35f486b559410d3c48':
  MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive
 2015-07-21 00:37:43 +00:00
Jorim Jaggi
1eb7ccd1f7 am 631cf9cd: am b946ce96: am 00fe1b65: am 4cd72169: Fix window animation flickering 
* commit '631cf9cdb5548b4966740f74f817775dc9f2abd1':
  Fix window animation flickering
 2015-07-21 00:37:18 +00:00
Jae Seo
6ff64bc34d am 6564934d: am b2eed1d6: Merge "TIF: Get or create the user state when failed to find existing one" into mnc-dev 
* commit '6564934d1a3f1020184c48bdddbe91321652a0b2':
  TIF: Get or create the user state when failed to find existing one
 2015-07-21 00:28:20 +00:00
Jae Seo
6564934d1a am b2eed1d6: Merge "TIF: Get or create the user state when failed to find existing one" into mnc-dev 
* commit 'b2eed1d6e11f38c00ce1776ade14dfa004c6119f':
  TIF: Get or create the user state when failed to find existing one
 2015-07-21 00:10:47 +00:00
Dongwon Kang
e64dfb4773 am 14bdaa7f: am 6444fe12: Merge "MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive" into mnc-dev 
* commit '14bdaa7f6b2140dadb631e67d61462219c678100':
  MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive
 2015-07-21 00:00:44 +00:00
Jorim Jaggi
b946ce96d2 am 00fe1b65: am 4cd72169: Fix window animation flickering 
* commit '00fe1b650a8ac66838273d91ecf5facd6225bca1':
  Fix window animation flickering
 2015-07-21 00:00:24 +00:00
Jae Seo
b2eed1d6e1 Merge "TIF: Get or create the user state when failed to find existing one" into mnc-dev 2015-07-20 23:59:25 +00:00
Dongwon Kang
14bdaa7f6b am 6444fe12: Merge "MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive" into mnc-dev 
* commit '6444fe121449f1cacf4500d3098b590c74e3646d':
  MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive
 2015-07-20 23:56:37 +00:00
Jorim Jaggi
740452e875 Touch, wake and unlock 
- Add onFingerprintAcquired, so Keyguard can grab a wakelock to prevent
the device from sleeping.
- If we get a successful fingerprint, wake the device up, immediately
dismiss the keyguard and tell PWM that we kicked off our frame that
will represent the correct state.
- PWM then waits for this frame to be drawn, and then turns on the
screen, which results in unlocking directly to the previsouly
opened app.

Bug: 21855614
Change-Id: I5f43df17fa5e4e9c6a6392eef4a4590b07df4f96
 2015-07-20 23:52:20 +00:00
Dongwon Kang
6444fe1214 Merge "MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive" into mnc-dev 2015-07-20 23:50:03 +00:00
Jorim Jaggi
00fe1b650a am 4cd72169: Fix window animation flickering 
* commit '4cd7216967a3e6211785c8acdeca449d61d796a0':
  Fix window animation flickering
 2015-07-20 23:45:37 +00:00
Jeff Sharkey
54d42be6eb Avoid NPE when no staged installs. 
listFiles() returns null instead of empty list; deal with it.

Bug: 22608671
Change-Id: I60dabec31932af3cded915c6927a4c5e5c71775d
 2015-07-20 16:37:54 -07:00
Jorim Jaggi
4cd7216967 Fix window animation flickering 
Bug: 22502673
Change-Id: I939e5840e10f3c0582148a5a01908076f994ae69
 2015-07-20 23:31:25 +00:00
Simranjit Singh Kohli
976b0428c5 am 6bd77bf8: am af12538d: am 7b36e3ad: am 02aff29c: Merge "[Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The callers should mak 
* commit '6bd77bf8a224bc57eaadfb2256f8fc0bc20ac50e':
  [Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The callers should make sure they are calling it after clearing identity.
 2015-07-20 23:31:00 +00:00
Jae Seo
4f1a6d477c TIF: Get or create the user state when failed to find existing one 
Bug: 22560640
Change-Id: Idc56dc2b16319d173f005fc236f91f70d1a93fad
 2015-07-20 16:20:18 -07:00
Simranjit Singh Kohli
af12538d59 am 7b36e3ad: am 02aff29c: Merge "[Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The callers should make sure they are calling it 
* commit '7b36e3adf58b99c06bbe8691132fb6e32bb445bc':
  [Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The callers should make sure they are calling it after clearing identity.
 2015-07-20 23:01:52 +00:00
Dongwon Kang
500747bf8f MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive 
AudioSystem.isStreamActive() includes a blocking IPC, so it shouldn't be called
in MSR.adjustVolume() which is called from MediaSessionService while holding a
lock.

Bug: 22606983
Change-Id: I3ab94e73731176d9bf80dbc2121702025547114c
 2015-07-20 15:59:53 -07:00
Simranjit Singh Kohli
7b36e3adf5 am 02aff29c: Merge "[Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The callers should make sure they are calling it after cleari 
* commit '02aff29c396373acc16be159c8c4ed59f61faaed':
  [Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The callers should make sure they are calling it after clearing identity.
 2015-07-20 22:44:18 +00:00
Nick Kralevich
2fedc4df51 UsbDeviceManager: add back support for USB overlays 
Commit fcf10f7c12cb3107bdfedce6f76a8c866d154f3c removed support for USB
overlays. Add it back in, as some devices depend on it.

Bug: 22062484
Bug: 21195124
Change-Id: I74d12699201355b07475744c641e31fdc4bb5a4a
 2015-07-20 15:40:54 -07:00
Simranjit Singh Kohli
02aff29c39 Merge "[Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The callers should make sure they are calling it after clearing identity." into mnc-dev 2015-07-20 22:40:03 +00:00
Jae Seo
d12974f336 am a38aaba2: am c160c231: am 48d707ae: am 26f7720e: Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev 
* commit 'a38aaba22208af66deb387dc7c21e0308065fbec':
  MediaSession: Do not lock on AudioManager.getStreamVolume
 2015-07-20 21:46:26 +00:00
Jeff Sharkey
d4dc87569f am 4524184c: am f811d7fc: am fe7a311c: am 35ba2cdb: Merge "Inherit ABI when moving existing install." into mnc-dev 
* commit '4524184c07f25548cd4cd94713b529ed73d419ac':
  Inherit ABI when moving existing install.
 2015-07-20 21:46:18 +00:00
Jae Seo
c160c231ab am 48d707ae: am 26f7720e: Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev 
* commit '48d707ae07df8b03585fc00880e61ebf7cdb6a5b':
  MediaSession: Do not lock on AudioManager.getStreamVolume
 2015-07-20 21:17:32 +00:00
Jeff Sharkey
f811d7fc0f am fe7a311c: am 35ba2cdb: Merge "Inherit ABI when moving existing install." into mnc-dev 
* commit 'fe7a311c421473f1b50dcd2751585f89664a4327':
  Inherit ABI when moving existing install.
 2015-07-20 21:17:28 +00:00
Jae Seo
48d707ae07 am 26f7720e: Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev 
* commit '26f7720ed0d6a0894772d82b7ebed03ac686c6f3':
  MediaSession: Do not lock on AudioManager.getStreamVolume
 2015-07-20 20:55:14 +00:00
Jeff Sharkey
fe7a311c42 am 35ba2cdb: Merge "Inherit ABI when moving existing install." into mnc-dev 
* commit '35ba2cdbf8654d708e57d209131dd498705d0e18':
  Inherit ABI when moving existing install.
 2015-07-20 20:55:09 +00:00
Jae Seo
26f7720ed0 Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev 2015-07-20 20:45:11 +00:00