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

149547 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
cdd33cff42 am 814723ea: am f6a549d1: am 180152af: Merge "Remove constants for VOICE_CONTROL_ZEN_MODE." into lmp-dev 
* commit '814723ea7f151b28058a62d228d2a47452d40db7':
  Remove constants for VOICE_CONTROL_ZEN_MODE.
 2014-08-09 20:08:55 +00:00
Barnaby James
462f144e3f am f6a549d1: am 180152af: Merge "Remove constants for VOICE_CONTROL_ZEN_MODE." into lmp-dev 
* commit 'f6a549d19a03b3c354b906c1b4e9cb54b0bd92d9':
  Remove constants for VOICE_CONTROL_ZEN_MODE.
 2014-08-09 20:05:49 +00: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
2205c0e2bf am 322fbf0a: am e9367567: am ff5faba3: Merge "Doze: Pulse once when a pickup gesture is received." into lmp-dev 
* commit '322fbf0ad249bc082e8559807f2e2651915354cb':
  Doze: Pulse once when a pickup gesture is received.
 2014-08-09 18:52:58 +00:00
John Spurlock
a42707cf89 am e9367567: am ff5faba3: Merge "Doze: Pulse once when a pickup gesture is received." into lmp-dev 
* commit 'e93675677b9f0e5b28d1c7de5b805e558833f752':
  Doze: Pulse once when a pickup gesture is received.
 2014-08-09 18:49:46 +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
299c855cb0 am 2919ca0d: am 521d9cb0: am 88e7f3c4: Merge "Use thread safe set for adapter set" into lmp-dev 
* commit '2919ca0dec35a59661d51349feaf94d012276b70':
  Use thread safe set for adapter set
 2014-08-09 16:46:44 +00:00
Jay Shrauner
1e4556189a am 521d9cb0: am 88e7f3c4: Merge "Use thread safe set for adapter set" into lmp-dev 
* commit '521d9cb07f5560723fae426080d36a48cff56919':
  Use thread safe set for adapter set
 2014-08-09 16:43:12 +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
fb7a04a08c am 84588ac7: am b47e5650: am 93598a4f: SysUI: Null check around ranking map in isAmbient call. 
* commit '84588ac7f0d997aed1ac1c987063d4d97de4ea46':
  SysUI: Null check around ranking map in isAmbient call.
 2014-08-09 15:29:37 +00:00
John Spurlock
a9a1e27d9b am b47e5650: am 93598a4f: SysUI: Null check around ranking map in isAmbient call. 
* commit 'b47e56507f863989c98d27805ec66105b2bd00ad':
  SysUI: Null check around ranking map in isAmbient call.
 2014-08-09 15:24:59 +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
44ff250f37 am ee1fb33f: am a6b1d678: am eca07a16: Merge "Added Tunneled video playback support to MediaCodec" into lmp-dev 
* commit 'ee1fb33f9fa10b2f3060d989ca32cecc36a9b54c':
  Added Tunneled video playback support to MediaCodec
 2014-08-09 05:23:03 +00:00
Rachad
7b4c24bb55 am a6b1d678: am eca07a16: Merge "Added Tunneled video playback support to MediaCodec" into lmp-dev 
* commit 'a6b1d6789fc99d0990383973f9a57570e3028546':
  Added Tunneled video playback support to MediaCodec
 2014-08-09 05:14:08 +00: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
f23e6bd45f am 46d239e7: am 8677fbb2: am 96dc0629: Merge "AAPT support for feature splits" into lmp-dev 
* commit '46d239e7c2d39cfc62262315c22df78f7497120f':
  AAPT support for feature splits
 2014-08-09 04:21:03 +00:00
Adam Lesinski
fee7eed93a am 8677fbb2: am 96dc0629: Merge "AAPT support for feature splits" into lmp-dev 
* commit '8677fbb29473babc0c6942163b8a796450f4f33b':
  AAPT support for feature splits
 2014-08-09 03:30:19 +00:00
Winson Chung
f1eff768c1 am b6850473: am da48e8a9: am 038561b5: Merge "Fixing transition animation in landscape on tablets (Bug 16867731)" into lmp-dev 
* commit 'b68504737db37f2a609f4b95d10fcefe8674c9b1':
  Fixing transition animation in landscape on tablets (Bug 16867731)
 2014-08-09 03:14:12 +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
781d0b66fe am da48e8a9: am 038561b5: Merge "Fixing transition animation in landscape on tablets (Bug 16867731)" into lmp-dev 
* commit 'da48e8a915287c78140eae221073eedc2dc20a2f':
  Fixing transition animation in landscape on tablets (Bug 16867731)
 2014-08-09 01:00:46 +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
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
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
Jae Seo
186b869020 Merge "Ensure that custom label isn't empty" into lmp-dev 2014-08-09 00:40:15 +00:00
Jaewan Kim
05abff10e3 Ensure that custom label isn't empty 
This also changes getHiddenTvInputIds to return mutable ArrayList.

Bug: 16876078
Change-Id: Ib84a071e7a7cf390ac4f9cf69f3d8daf218d657d
 2014-08-11 21:01:36 +09: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
Jose Lima
fea4cddb37 am 4e3f4aeb: am 71e07247: am 927d07ec: Merge "Added StatusBarNotification.aidl to frameworks/base/Android.mk" into lmp-dev 
* commit '4e3f4aeb32bf960ff0d9f98d0d69aed54cd3af95':
  Added StatusBarNotification.aidl to frameworks/base/Android.mk
 2014-08-09 00:12:11 +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
cff9bc2e84 am 71e07247: am 927d07ec: Merge "Added StatusBarNotification.aidl to frameworks/base/Android.mk" into lmp-dev 
* commit '71e07247546df05efd6b335f2604c93d0ff1eda7':
  Added StatusBarNotification.aidl to frameworks/base/Android.mk
 2014-08-09 00:08:16 +00:00
Amith Yamasani
4c64af4f63 am 9961cc34: am 70a36a49: am 3cb15637: Allow singleton providers to accept connections from other users 
* commit '9961cc3450b2dc023f5c045ae37d747a89e12f3c':
  Allow singleton providers to accept connections from other users
 2014-08-09 00:08:07 +00:00
Amith Yamasani
0cbce460bc am 70a36a49: am 3cb15637: Allow singleton providers to accept connections from other users 
* commit '70a36a49acb54a225568cdb09c1566935cc940a2':
  Allow singleton providers to accept connections from other users
 2014-08-09 00:04:08 +00: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