Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
148,050 Commits 3 Branches 0 Tags
40bcb409f3e7df975cf2cb1778c30f578ccbe6bc
Commit Graph

148050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jungshik Jang
40bcb409f3 am 86226886: Add IHdmiSystemAudioModeChangeListner to TvInputHardwareManager. 
* commit '862268860939a8d5002402ceaa4629cf238b8494':
  Add IHdmiSystemAudioModeChangeListner to TvInputHardwareManager.
 2014-08-11 05:39:30 +00:00
Jungshik Jang
82828dd99f am 05df974a: Hook up device power status change to TIF 
* commit '05df974a127a6c4b38a030d449d54d336813bfc1':
  Hook up device power status change to TIF
 2014-08-11 04:56:58 +00:00
Jungshik Jang
1f819bbfc8 Add IHdmiSystemAudioModeChangeListner to TvInputHardwareManager. 
This is to update audio patch when HDMI-CEC system audio mode is changed.

Bug: 16113320
Change-Id: I312fffe511c0bce1c973bb66e9c16875e5dcee56
 2014-08-11 13:51:37 +09:00
Jungshik Jang
61daf6b38e Hook up device power status change to TIF 
Instead of introducing new api update existing
IDeviceEventListener

Bug: 16445063
Change-Id: I93bfc736a06a78e83c95877a53f4f241b51ed9c0
 2014-08-11 10:40:29 +09:00
Jeff Sharkey
7479b3ab7c am 38b7ea4c: Merge "GID-based permissions are defined by "android"." into lmp-dev 
* commit '38b7ea4cf1b3cf5dfc6e7c59a5a37e8f8f6bf098':
  GID-based permissions are defined by "android".
 2014-08-10 23:15:22 +00:00
Vinit Deshpande
900d969feb am bac93970: Merge "Unhide WifiPasspointManager for ANQP APIs - DO NOT MERGE" into lmp-dev 
* commit 'bac9397083b220fd9d6ae3c24beafebf790f3f18':
  Unhide WifiPasspointManager for ANQP APIs - DO NOT MERGE
 2014-08-10 22:03:55 +00:00
Vinit Deshpande
aa740e812d am 70825f5c: Merge "Support EAP-SIM and EAP-AKA" into lmp-dev 
* commit '70825f5c3f1b4426984ca188f64d38db3be37b0e':
  Support EAP-SIM and EAP-AKA
 2014-08-10 20:27:23 +00:00
Christopher Tate
e3fcc87d2f am 932cd04a: Merge "Start using cancelFullBackup() when appropriate" into lmp-dev 
* commit '932cd04a891f342501ef26a572a84986feab47c5':
  Start using cancelFullBackup() when appropriate
 2014-08-10 19:41:11 +00:00
Jae Seo
7e33d6870a am 44a3a39c: Merge "TIF: Move watch history logging to TvProvider" into lmp-dev 
* commit '44a3a39c39b57fe9988bdbfd3472dfe5818571f5':
  TIF: Move watch history logging to TvProvider
 2014-08-10 17:43:56 +00:00
Jean-Michel Trivi
7159c9a6bf am 0939dd1d: Merge "Define FLAG_BEACON in android.media.AudioAttributes" into lmp-dev 
* commit '0939dd1db67885d1e6dbc1b70970f2f31bf82805':
  Define FLAG_BEACON in android.media.AudioAttributes
 2014-08-10 17:36:30 +00:00
Chulwoo Lee
5911f01b10 am 516fb60d: Merge "TIF: Fix a bug of incorrect watch history" into lmp-dev 
* commit '516fb60d3c0bad7262f3ff83c0185e752377b393':
  TIF: Fix a bug of incorrect watch history
 2014-08-10 08:16:46 +00:00
Sailesh Nepal
1395522167 am 375be76e: Merge "Use thread safe set for RemoteConnection.mListeners" into lmp-dev 
* commit '375be76e3b6df46a7a680bcca9b6eb6e9b1aa59c':
  Use thread safe set for RemoteConnection.mListeners
 2014-08-10 08:16:31 +00:00
Tyler Gunn
df07960788 am d9593758: Merge "Adding camera failure/ready session events." into lmp-dev 
* commit 'd9593758c3290fe8e08f201a75f88d0e8310d90f':
  Adding camera failure/ready session events.
 2014-08-10 08:16:25 +00:00
Dianne Hackborn
1abf7bb21d am 47df503b: Fix issues 16739817 and 16709247 in voice interaction service. 
* commit '47df503b6968e10e1510fb9db808831f23437c16':
  Fix issues 16739817 and 16709247 in voice interaction service.
 2014-08-09 20:37:01 +00:00
Dianne Hackborn
a351ab9698 Fix issues 16739817 and 16709247 in voice interaction service. 
Issue #16739817 VIS doesn't start for non-primary user(s)
Issue #16709247 GSA is not the default voice interaction agent

These are both fixed by getting rid of the existing code for applying
the default voice recognizer, moving it in to the voice interaction
manager service, and extending it to also set up the default voice
interaction service.

Change-Id: If8d5936c28aebfa7eff77c8d99241c3a2ffdb0a4
 2014-08-09 13:31:59 -07:00
Barnaby James
dd920d30c4 am 180152af: Merge "Remove constants for VOICE_CONTROL_ZEN_MODE." into lmp-dev 
* commit '180152af684c214db2fd1f1527c88be1f2c7657e':
  Remove constants for VOICE_CONTROL_ZEN_MODE.
 2014-08-09 20:01:31 +00:00
John Spurlock
1e97c6c2d7 am ff5faba3: Merge "Doze: Pulse once when a pickup gesture is received." into lmp-dev 
* commit 'ff5faba3745824984fa1a979f5bdd77a3ec61ca2':
  Doze: Pulse once when a pickup gesture is received.
 2014-08-09 18:45:19 +00:00
Jay Shrauner
a310293fde am 88e7f3c4: Merge "Use thread safe set for adapter set" into lmp-dev 
* commit '88e7f3c48d6110281c476a36829f2940cd418449':
  Use thread safe set for adapter set
 2014-08-09 16:38:46 +00:00
John Spurlock
89d65b3591 am 93598a4f: SysUI: Null check around ranking map in isAmbient call. 
* commit '93598a4fafcc1d1aba9838b6b75096c141436452':
  SysUI: Null check around ranking map in isAmbient call.
 2014-08-09 15:19:02 +00:00
John Spurlock
f079fc52f3 SysUI: Null check around ranking map in isAmbient call. 
Bug:16907252
Change-Id: Id21e089b99c1836ac0bbffd205ba89dc05f07b9a
 2014-08-09 11:10:03 -04:00
Rachad
2c401029e5 am eca07a16: Merge "Added Tunneled video playback support to MediaCodec" into lmp-dev 
* commit 'eca07a163ac37e1c72c2e174679068789df977dc':
  Added Tunneled video playback support to MediaCodec
 2014-08-09 05:06:38 +00:00
Adam Lesinski
4649fdfb65 am 96dc0629: Merge "AAPT support for feature splits" into lmp-dev 
* commit '96dc06291a7fc8779730419d0a9fcd00d526285f':
  AAPT support for feature splits
 2014-08-09 01:58:10 +00:00
Winson Chung
2ce27629d4 am 038561b5: Merge "Fixing transition animation in landscape on tablets (Bug 16867731)" into lmp-dev 
* commit '038561b5d34ed2b97d3e0d8e236f3ce30b7557ef':
  Fixing transition animation in landscape on tablets (Bug 16867731)
 2014-08-09 00:56:46 +00:00
Jean-Michel Trivi
8b72930bc0 Merge "Define FLAG_BEACON in android.media.AudioAttributes" into lmp-dev 2014-08-09 00:51:24 +00:00
Jeff Sharkey
3d1232f351 Merge "GID-based permissions are defined by "android"." into lmp-dev 2014-08-09 00:45:27 +00:00
Jeff Sharkey
fb2c4d1861 GID-based permissions are defined by "android". 
This matches all other permissions defined by framework-res.apk,
instead of leaving it null.

Bug: 16907551
Change-Id: I7e2d671443d987906b2f29aa1579bef6380e8a52
 2014-08-10 13:58:05 -07:00
Jae Seo
d86eb6f8a4 Merge "TIF: Move watch history logging to TvProvider" into lmp-dev 2014-08-09 00:45:27 +00:00
Jae Seo
7eb75dff7a TIF: Move watch history logging to TvProvider 
There are only two kinds of watch events that can happen on the system:
 1. The current TV input session is tuned to a new channel.
 2. The session is released for some reason.
The former indicates the end of the previous log entry, if any, followed by the
start of a new entry. The latter indicates the end of the most recent entry for
the given session. Here the system supplies the database the smallest set of
information only that is sufficient to consolidate the log entries while
minimizing database operations in the system service.

Bug: 14791151, Bug: 15921205, Bug: 15988715, Bug: 16831555
Change-Id: Ifcb1a1273c14ee234919d819d082b1004eb92ebc
 2014-08-10 10:39:52 -07:00
Barnaby James
d78e811498 Merge "Remove constants for VOICE_CONTROL_ZEN_MODE." into lmp-dev 2014-08-09 00:45:27 +00:00
Barnaby James
b8850040c4 Remove constants for VOICE_CONTROL_ZEN_MODE. 
Change-Id: I197d68e66d9a1b197e7c35fd140101458cf5bfc7
 2014-08-08 22:48:35 -07:00
Rachad
6adf47eacc Merge "Added Tunneled video playback support to MediaCodec" into lmp-dev 2014-08-09 00:45:27 +00:00
Rachad
73fc533b2e Added Tunneled video playback support to MediaCodec 
Bug:16132368
Change-Id: I8c28cd9fbf3ca2d441f5ffa6892fbc5f70184908
 2014-08-09 01:29:43 +00:00
Vinit Deshpande
88992bc90c Merge "Unhide WifiPasspointManager for ANQP APIs - DO NOT MERGE" into lmp-dev 2014-08-09 00:40:15 +00:00
Vinit Deshpande
894651bab5 Unhide WifiPasspointManager for ANQP APIs - DO NOT MERGE 
This is unhiding some unwanted changes too; but we'll fix that later.

Change-Id: I35343815e99aafbec8e4ef4d0707499fb6219457
 2014-08-10 19:30:00 +00:00
Christopher Tate
83b2fb8f73 Merge "Start using cancelFullBackup() when appropriate" into lmp-dev 2014-08-09 00:40:15 +00:00
Christopher Tate
bf1a4a81eb Start using cancelFullBackup() when appropriate 
The API was in place but the framework wasn't yet calling it.

Bug 16524520

Change-Id: Ie368758c830a7d0ad11e7dd3142a0ed896069944
 2014-08-09 00:48:47 +00:00
Sailesh Nepal
ea201b31a3 Merge "Use thread safe set for RemoteConnection.mListeners" into lmp-dev 2014-08-09 00:40:15 +00:00
Sailesh Nepal
d5bcb68cb7 Use thread safe set for RemoteConnection.mListeners 
Switch from HashSet to set backed by a ConcurrentHashMap to prevent
ConcurrentModificationExceptions.

Bug: 16901565
Change-Id: I7666ef61e94994963b2c2634a9a250365e753888
 2014-08-09 16:36:35 -07:00
Tyler Gunn
c4d63d705c Merge "Adding camera failure/ready session events." into lmp-dev 2014-08-09 00:40:15 +00:00
Jay Shrauner
745ba00491 Merge "Use thread safe set for adapter set" into lmp-dev 2014-08-09 00:40:15 +00:00
Adam Lesinski
ec64709ce0 Merge "AAPT support for feature splits" into lmp-dev 2014-08-09 00:40:15 +00:00
Jay Shrauner
b0c0e36faf Use thread safe set for adapter set 
Switch from HashSet to set backed by a ConcurrentHashMap to prevent
ConcurrentModificationExceptions.

Bug:16898286
Change-Id: I5d94b403469e98c5f5431fc1d0ad020985100cfd
 2014-08-08 17:08:53 -07:00
Jose Lima
d2655891f1 am 927d07ec: Merge "Added StatusBarNotification.aidl to frameworks/base/Android.mk" into lmp-dev 
* commit '927d07eca6941c5c331a6491ff1b45850fa1bc44':
  Added StatusBarNotification.aidl to frameworks/base/Android.mk
 2014-08-09 00:03:44 +00:00
Amith Yamasani
e6e2d08938 am 3cb15637: Allow singleton providers to accept connections from other users 
* commit '3cb156372b0b18030196e17f1d503e2a62531594':
  Allow singleton providers to accept connections from other users
 2014-08-08 23:56:48 +00:00
Amith Yamasani
a6f4d58b90 Allow singleton providers to accept connections from other users 
This is required for singleton providers like sms log.

Change-Id: Icb18a764c27dc1b43f8b8bcc24c21c91274995fd
 2014-08-08 16:50:42 -07:00
George Mount
8a881cc33a am 8011744b: Merge "Move shared elements to overlay when in a transition group." into lmp-dev 
* commit '8011744b52dbd2089b079fcd7e426550f40a8379':
  Move shared elements to overlay when in a transition group.
 2014-08-08 23:48:19 +00:00
Jeff Sharkey
0369cdf329 am 64f7e438: Move DocumentsUI settings into overflow menu. 
* commit '64f7e43838255464164b5dd56595590ec14eefab':
  Move DocumentsUI settings into overflow menu.
 2014-08-08 23:16:54 +00:00
Jose Lima
7f708ecc2f Merge "Added StatusBarNotification.aidl to frameworks/base/Android.mk" into lmp-dev 2014-08-08 23:07:59 +00:00
Jose Lima
b6d77e2d16 Added StatusBarNotification.aidl to frameworks/base/Android.mk 
Change-Id: I98fb4821642e3431bb41506de3d8905f90a40729
 2014-08-08 16:39:28 -07:00
George Mount
9985aaf268 Merge "Move shared elements to overlay when in a transition group." into lmp-dev 2014-08-08 23:02:20 +00:00