Commit Graph

61571 Commits

Author SHA1 Message Date
Chad Brubaker
2929f9648e Merge "Dont trust the user added CA store by default for apps targeting N" into nyc-dev am: c1b0236d70
am: bc2cd253a0

* commit 'bc2cd253a07159cf7b89280c0261d06d52aaa2cf':
  Dont trust the user added CA store by default for apps targeting N
2016-02-25 00:30:46 +00:00
Chad Brubaker
bc2cd253a0 Merge "Dont trust the user added CA store by default for apps targeting N" into nyc-dev
am: c1b0236d70

* commit 'c1b0236d7069c99195607a48c5d10377e6750748':
  Dont trust the user added CA store by default for apps targeting N
2016-02-25 00:22:06 +00:00
Phil Burk
da0c640171 Merge "Settings: add ENCODED_SURROUND_OUTPUT" into nyc-dev am: 8dcdaaf11f
am: 6c5aacccd8

* commit '6c5aacccd8af20fa777bb8034d840e78102af640':
  Settings: add ENCODED_SURROUND_OUTPUT
2016-02-25 00:18:06 +00:00
Phil Burk
6c5aacccd8 Merge "Settings: add ENCODED_SURROUND_OUTPUT" into nyc-dev
am: 8dcdaaf11f

* commit '8dcdaaf11fe3b12a3d82f68287aa4f6119aafaa4':
  Settings: add ENCODED_SURROUND_OUTPUT
2016-02-25 00:10:02 +00:00
Chad Brubaker
c1b0236d70 Merge "Dont trust the user added CA store by default for apps targeting N" into nyc-dev 2016-02-25 00:02:37 +00:00
Alan Viverette
683273ab10 Merge "Fix exit transition and dismiss callback for popup exit transition" into nyc-dev am: 5249bd296d
am: d3b13eb3ef

* commit 'd3b13eb3efd1695f31d863a90e0dfec8eaae5fed':
  Fix exit transition and dismiss callback for popup exit transition
2016-02-24 23:51:18 +00:00
Phil Burk
8dcdaaf11f Merge "Settings: add ENCODED_SURROUND_OUTPUT" into nyc-dev 2016-02-24 23:49:18 +00:00
Alan Viverette
d3b13eb3ef Merge "Fix exit transition and dismiss callback for popup exit transition" into nyc-dev
am: 5249bd296d

* commit '5249bd296df1a91bc3bc0009d067321f1c119866':
  Fix exit transition and dismiss callback for popup exit transition
2016-02-24 23:33:52 +00:00
Arunesh Mishra
3ad1022a77 Merge "Fix AlwaysOnHotwordDetector recognition event bug." into nyc-dev am: 7dbef2da93
am: 5f2742afd8

* commit '5f2742afd8dd05ac83e0d5b4fd9b5da52202c9ab':
  Fix AlwaysOnHotwordDetector recognition event bug.
2016-02-24 23:26:03 +00:00
Alan Viverette
5249bd296d Merge "Fix exit transition and dismiss callback for popup exit transition" into nyc-dev 2016-02-24 23:22:21 +00:00
Arunesh Mishra
5f2742afd8 Merge "Fix AlwaysOnHotwordDetector recognition event bug." into nyc-dev
am: 7dbef2da93

* commit '7dbef2da936093bf7e9e6bb3059c3825ce1e408d':
  Fix AlwaysOnHotwordDetector recognition event bug.
2016-02-24 23:18:45 +00:00
Adam Powell
0f646a0865 Merge "Protect FragmentManager against View.NO_ID container ids" into nyc-dev am: dc5e3a3074
am: ee1970208e

* commit 'ee1970208e4e6a168113fb3cf57901de30282204':
  Protect FragmentManager against View.NO_ID container ids
2016-02-24 23:12:17 +00:00
Arunesh Mishra
7dbef2da93 Merge "Fix AlwaysOnHotwordDetector recognition event bug." into nyc-dev 2016-02-24 23:12:12 +00:00
Adam Powell
ee1970208e Merge "Protect FragmentManager against View.NO_ID container ids" into nyc-dev
am: dc5e3a3074

* commit 'dc5e3a30745ecdb219b33cec2b826f377ba5d134':
  Protect FragmentManager against View.NO_ID container ids
2016-02-24 23:06:01 +00:00
Todd Kennedy
bbba6c2d3c Merge "Revert "Remove deprecated methods / classes"" into nyc-dev am: fe01ea05dd
am: acbcf9d9ab

* commit 'acbcf9d9abfdecaf9c8038f810e12e183c59f422':
  Revert "Remove deprecated methods / classes"
2016-02-24 23:04:53 +00:00
Adam Powell
dc5e3a3074 Merge "Protect FragmentManager against View.NO_ID container ids" into nyc-dev 2016-02-24 23:01:34 +00:00
Todd Kennedy
acbcf9d9ab Merge "Revert "Remove deprecated methods / classes"" into nyc-dev
am: fe01ea05dd

* commit 'fe01ea05dd196acaf95a61e169f6b75654ae0875':
  Revert "Remove deprecated methods / classes"
2016-02-24 22:54:13 +00:00
Makoto Onuki
137077cddd Merge "Support safe mode properly." into nyc-dev am: a4fae1545a
am: 04d8eca54a

* commit '04d8eca54af9d46e793134a9168f658b9d68017f':
  Support safe mode properly.
2016-02-24 22:47:47 +00:00
Raph Levien
930d0e0063 Merge "Update data for emoji modifier bases to Unicode 9" into nyc-dev am: 785eb6039b
am: 56e9bb0db4

* commit '56e9bb0db4157d62c78e6b6063d05da33ffc20ba':
  Update data for emoji modifier bases to Unicode 9
2016-02-24 22:46:02 +00:00
Todd Kennedy
fe01ea05dd Merge "Revert "Remove deprecated methods / classes"" into nyc-dev 2016-02-24 22:45:50 +00:00
Todd Kennedy
5cbeb59026 Revert "Remove deprecated methods / classes"
This reverts commit 9706c01f9b.

Change-Id: I14c53ab140220e48f6728b1173ea58760bbeb7f9
2016-02-24 22:45:00 +00:00
Makoto Onuki
04d8eca54a Merge "Support safe mode properly." into nyc-dev
am: a4fae1545a

* commit 'a4fae1545ae38f61385e45e8f635994f447efca5':
  Support safe mode properly.
2016-02-24 22:29:58 +00:00
Makoto Onuki
a4fae1545a Merge "Support safe mode properly." into nyc-dev 2016-02-24 22:20:08 +00:00
Raph Levien
56e9bb0db4 Merge "Update data for emoji modifier bases to Unicode 9" into nyc-dev
am: 785eb6039b

* commit '785eb6039b8b161c36bfa1e6add1cd1cd7975208':
  Update data for emoji modifier bases to Unicode 9
2016-02-24 22:15:32 +00:00
Raph Levien
785eb6039b Merge "Update data for emoji modifier bases to Unicode 9" into nyc-dev 2016-02-24 22:00:59 +00:00
Jeff Sharkey
1b4676b638 Merge "Temporary fix for QXDM crashes." into nyc-dev am: 2f457f470c
am: aedb89b0c5

* commit 'aedb89b0c5a92851193bfbde3a1be528fbb29850':
  Temporary fix for QXDM crashes.
2016-02-24 21:38:40 +00:00
Jeff Sharkey
aedb89b0c5 Merge "Temporary fix for QXDM crashes." into nyc-dev
am: 2f457f470c

* commit '2f457f470cd260f07ab481ab6fb3cad143f9a958':
  Temporary fix for QXDM crashes.
2016-02-24 21:29:17 +00:00
Phil Burk
deaa8d94fd Settings: add ENCODED_SURROUND_OUTPUT
Support AUTO, ALWAYS or NEVER preference for using AC3 and DTS.

Bug: 24541671
Change-Id: I423969882d18d99ce93bea57d10bdb1da7063b7a
Signed-off-by: Phil Burk <philburk@google.com>
2016-02-24 13:24:54 -08:00
Todd Kennedy
0e52890e2b Merge "Remove deprecated methods / classes" into nyc-dev am: ca67844e0c
am: 07e794ad14

* commit '07e794ad14e0cfa433402a2fca4c14d26192facb':
  Remove deprecated methods / classes
2016-02-24 21:22:45 +00:00
Jeff Sharkey
2f457f470c Merge "Temporary fix for QXDM crashes." into nyc-dev 2016-02-24 21:16:35 +00:00
Jeff Sharkey
d7793693ad Temporary fix for QXDM crashes.
Bug: 26971038
Change-Id: I59efbdec11ca8d9a0b640c092402091d66b220a0
2016-02-24 14:15:03 -07:00
Makoto Onuki
889c088066 Support safe mode properly.
In safe mode, IPM.queryXxx() doesn't work.  Use IPM.getReceiverInfo()
directly instead.

Bug 27108276

Change-Id: Ice8f882559b8f0596a19ddb3a16395a4dc538a25
2016-02-24 13:12:01 -08:00
Todd Kennedy
07e794ad14 Merge "Remove deprecated methods / classes" into nyc-dev
am: ca67844e0c

* commit 'ca67844e0c6b564970b8d329009c0d110888a3fc':
  Remove deprecated methods / classes
2016-02-24 21:11:47 +00:00
Raph Levien
ccb4b5c078 Update data for emoji modifier bases to Unicode 9
This patch updates the set of emoji modifier bases to Unicode 9,
using data from:
http://www.unicode.org/Public/emoji/3.0/emoji-data.txt

Bug: 27039487
Change-Id: I94c09113753c0595e72f403ba01b3e7fa78c5627
2016-02-24 13:05:55 -08:00
Todd Kennedy
ca67844e0c Merge "Remove deprecated methods / classes" into nyc-dev 2016-02-24 21:02:58 +00:00
Arunesh Mishra
f47f173b06 Fix AlwaysOnHotwordDetector recognition event bug.
Parcelables don't work well with inheritance. So changed the
IRecognitionStatusCallback to have onKeyphraseDetected() and
onGenericSoundTriggerDetected() for those respective events.

Made corresponding changes to AlwaysOnHotwordDetector and SoundTriggerDetector.

Bug: 27250528
Change-Id: Ic08a431e7cc4248c688b05c865348170246de576
2016-02-24 12:57:01 -08:00
Alan Viverette
21d361806c Fix exit transition and dismiss callback for popup exit transition
We should run the transition only when the anchor root IS attached,
and we should only call the dismiss callback when the animation has
completed and the window has been removed.

Bug: 25323707
Bug: 26647820
Change-Id: I2bcdc901885d4c0a6c48c2b2c949797def1d7512
2016-02-24 15:34:11 -05:00
Adrian Roos
d166e4d5d6 Merge "Fix broken remote inputs" into nyc-dev am: c949673876
am: da5755acf9

* commit 'da5755acf9c124da352c20938d8c88acadf123fe':
  Fix broken remote inputs
2016-02-24 20:31:22 +00:00
Adrian Roos
da5755acf9 Merge "Fix broken remote inputs" into nyc-dev
am: c949673876

* commit 'c949673876dd0be38afc7d38ab1a58e5993f727c':
  Fix broken remote inputs
2016-02-24 20:26:30 +00:00
Adrian Roos
c949673876 Merge "Fix broken remote inputs" into nyc-dev 2016-02-24 20:20:14 +00:00
Adrian Roos
5dd685f24c Fix broken remote inputs
Bug: 22452379
Change-Id: Ibcf0cf23e9f163b37270d42629de01083e12643c
2016-02-24 12:05:51 -08:00
Amith Yamasani
4e7188169d Merge "Optimize calls to TelephonyManager to check for privileged apps" into nyc-dev am: 66f0c6f3b8
am: 056454791e

* commit '056454791e370b83a98ffd9c7d88b2693644cb6a':
  Optimize calls to TelephonyManager to check for privileged apps
2016-02-24 19:59:09 +00:00
Sergey Poromov
e5ffeb4244 Merge "Fix NPE when null BackupObserver is passed into BackupManager#requestBackup()" into nyc-dev am: 54aaeb72e9
am: 83c62153c7

* commit '83c62153c729b3b2cfd62a86457ab6238de2cc55':
  Fix NPE when null BackupObserver is passed into BackupManager#requestBackup()
2016-02-24 19:56:54 +00:00
Amith Yamasani
056454791e Merge "Optimize calls to TelephonyManager to check for privileged apps" into nyc-dev
am: 66f0c6f3b8

* commit '66f0c6f3b8bde3ba224a1333a4acbf1b86c959ec':
  Optimize calls to TelephonyManager to check for privileged apps
2016-02-24 19:52:56 +00:00
Sergey Poromov
83c62153c7 Merge "Fix NPE when null BackupObserver is passed into BackupManager#requestBackup()" into nyc-dev
am: 54aaeb72e9

* commit '54aaeb72e9c4cfad94c55ea2b66815d8541b7073':
  Fix NPE when null BackupObserver is passed into BackupManager#requestBackup()
2016-02-24 19:50:38 +00:00
Amith Yamasani
66f0c6f3b8 Merge "Optimize calls to TelephonyManager to check for privileged apps" into nyc-dev 2016-02-24 19:42:12 +00:00
Sergey Poromov
54aaeb72e9 Merge "Fix NPE when null BackupObserver is passed into BackupManager#requestBackup()" into nyc-dev 2016-02-24 19:40:53 +00:00
Adam Powell
1275fcacf6 Merge "Un-hide string set persistence methods in Preference" into nyc-dev am: 475aa109dc
am: 75549d01bf

* commit '75549d01bf0ca3e28fc1e8f2ef6b9d08e686048d':
  Un-hide string set persistence methods in Preference
2016-02-24 19:34:53 +00:00
Amith Yamasani
4ec6368f13 Optimize calls to TelephonyManager to check for privileged apps
Calling into TelephonyManager each of hundreds of apps to check
if the app is carrier privileged was very expensive, especially
when there aren't even any carrier access rules specified. This
change fetches all the carrier privileged apps in one call,
reducing the number of IPC calls to the radio process and checks
the package names locally.

If the carrier rules change or packages are modified, the list
will be computed and fetched again.

Other optimizations in Telephony help speed up the individual calls
to check if a package is privileged, as well.

Bug: 27271861
Change-Id: I5a77b6da4f2cdc603d2a73bd8569c5c38f06b42d
2016-02-24 11:30:00 -08:00
Adam Powell
75549d01bf Merge "Un-hide string set persistence methods in Preference" into nyc-dev
am: 475aa109dc

* commit '475aa109dc78cc45eb76307dea5e54c4e9f44d5b':
  Un-hide string set persistence methods in Preference
2016-02-24 19:24:10 +00:00