Commit Graph

65641 Commits

Author SHA1 Message Date
Svetoslav Ganov
a8cdb6f645 Merge "Properly set default voice interactor" into nyc-dev am: e34bb5a1ff
am: 13f802dc01

* commit '13f802dc013866986be51328af21378783d19e61':
  Properly set default voice interactor

Change-Id: I29c2a1490877d4b25ca64fee8a53c6970d07a1f2
2016-06-02 22:47:29 +00:00
Svetoslav Ganov
13f802dc01 Merge "Properly set default voice interactor" into nyc-dev
am: e34bb5a1ff

* commit 'e34bb5a1ffc5fe35b2fbc58824ad5bfbc7ecad3d':
  Properly set default voice interactor

Change-Id: I1e9d7488ecac8569a585e00ebc7c45df1b1833c3
2016-06-02 22:43:41 +00:00
Svetoslav Ganov
e34bb5a1ff Merge "Properly set default voice interactor" into nyc-dev 2016-06-02 22:36:05 +00:00
Svetoslav Ganov
b625e19a87 Properly set default voice interactor
We need to figure out the default voice interactor to give
it default permissions. This happens before the user has
been unlocked and if the voice interactor is not direct
boot aware we fail to find it, hence no permissions are
granted. Now we query the package manager for both direct
boot aware and unaware components. This is fine as we
don't interact with the assistant until the user is
unlocked.

bug:28963642

Change-Id: Ide5471fa1798e868c6e3a4b5e87570a5556e2d3f
2016-06-02 15:25:15 -07:00
Chong Zhang
426fdee24e Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev am: b1e24209f1
am: 2f2af39911

* commit '2f2af39911976974177e92099e27c10fe93beddd':
  Fix scroll amount calculation in ViewRootImpl

Change-Id: I145857ecc2a07ad1b7bb80334ff81c2d990bb199
2016-06-02 21:11:53 +00:00
Chong Zhang
2f2af39911 Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev
am: b1e24209f1

* commit 'b1e24209f16621fd095dacb615364bfd15dfe721':
  Fix scroll amount calculation in ViewRootImpl

Change-Id: Idb326fa8e459aaf3a97d841c91b3ccefc48dad81
2016-06-02 21:06:00 +00:00
Chong Zhang
b1e24209f1 Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev 2016-06-02 20:58:06 +00:00
Chris Tate
4169184518 Merge "Don\'t back up/restore the "automatically restore app data" setting" into nyc-dev am: 453951d077
am: 4872e3df96

* commit '4872e3df962a386576b51e03a26add0ceb700698':
  Don't back up/restore the "automatically restore app data" setting

Change-Id: Idabd2988d6b63e06a018c24c1b3a9e17514596b3
2016-06-02 20:55:53 +00:00
Christopher Tate
4872e3df96 Merge "Don\'t back up/restore the "automatically restore app data" setting" into nyc-dev
am: 453951d077

* commit '453951d0777b1421e95bbcac501fb8b091c0f6a3':
  Don't back up/restore the "automatically restore app data" setting

Change-Id: Ia04215f6597dc3221bda438feb4921d53c1725fc
2016-06-02 20:49:27 +00:00
Chris Tate
453951d077 Merge "Don't back up/restore the "automatically restore app data" setting" into nyc-dev 2016-06-02 20:45:16 +00:00
Chong Zhang
6725472329 Fix scroll amount calculation in ViewRootImpl
When calculating scroll amount, we should check whehter focus
is visible using before-scrolling position.

It's possible that the view is already scrolled, then visible
insets changes (eg. IME went away). Previous scroll position
still makes the focus visible, but it will leave the focus
in a bad position when it should be scrolled back.

bug: 29025892
Change-Id: I091f16bebc4c1e5ba831616c51ab2ac75d4c4b3c
2016-06-02 13:33:40 -07:00
Dianne Hackborn
1d185fbad7 Merge "Work on issue #29042642: Watchdog going off" into nyc-dev am: 5a6cf3ac9a
am: c9aaec43a6

* commit 'c9aaec43a6ff487ff19e5fdb1871efb268b0592b':
  Work on issue #29042642: Watchdog going off

Change-Id: I1ddb808137c527967358e8b12fc93063dd153bfd
2016-06-02 18:55:13 +00:00
Dianne Hackborn
c9aaec43a6 Merge "Work on issue #29042642: Watchdog going off" into nyc-dev
am: 5a6cf3ac9a

* commit '5a6cf3ac9a3945c2d1f0e5e28ffda9e52124eb15':
  Work on issue #29042642: Watchdog going off

Change-Id: Ic0c08c2ab1c0e7b1cc195928492ab4c0eaef782f
2016-06-02 18:49:29 +00:00
Dianne Hackborn
5a6cf3ac9a Merge "Work on issue #29042642: Watchdog going off" into nyc-dev 2016-06-02 18:31:16 +00:00
Chris Wren
be2da62d11 resolve merge conflicts of 43c3a7e5 to nyc-mr1-dev
am: d958f83a01

* commit 'd958f83a017dde230203d91c8daedf36d40c22a6':
  make the notification enqueue rate threshold a setting

Change-Id: I5172c1a0f0832f3b93d05f0ab7b7b1ab7233d334
2016-06-02 16:41:30 +00:00
Chris Wren
d958f83a01 resolve merge conflicts of 43c3a7e5 to nyc-mr1-dev
Change-Id: I85619e6d8176bf23b6f4090c4573e5d9c248b585
2016-06-02 12:15:35 -04:00
Chris Wren
35f49c5968 Merge "make the notification enqueue rate threshold a setting" into nyc-dev
am: 43c3a7e5a7

* commit '43c3a7e5a781640b862cf6f51805b3823f46fd02':
  make the notification enqueue rate threshold a setting

Change-Id: I3e8c37aead7e1f2d5dc9fc89b72f82294bd16cfe
2016-06-02 15:13:43 +00:00
TreeHugger Robot
43c3a7e5a7 Merge "make the notification enqueue rate threshold a setting" into nyc-dev 2016-06-02 15:08:03 +00:00
Chris Wren
763a9bb095 make the notification enqueue rate threshold a setting
Bug: 28693065
Change-Id: I08bd2ed342d5347c0075183b239558c50ada4a0a
2016-06-02 15:07:20 +00:00
Android Build Merger (Role)
1d28af445b Merge "Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev am: e67a29a037 am: dd2fc463f1" into nyc-mr1-dev-plus-aosp 2016-06-02 10:46:32 +00:00
Calin Juravle
afb21eee20 Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev am: e67a29a037
am: dd2fc463f1

* commit 'dd2fc463f1f0a92f613930f372c58af10e58e64c':
  Don't create or check permissions on profiles during app startup

Change-Id: I00890adeda97295c0d5630efd7e497d7f0ece8b8
2016-06-02 10:36:40 +00:00
Mudumba Ananth
4bf18e1663 HFP 1.7 profile update (3/4)
am: 0d98ebf997

* commit '0d98ebf997b24e96d0328b4195a22832f9ae2664':
  HFP 1.7 profile update (3/4)

Change-Id: I1594696d1d341026b7bd7f0a65c5cdac7049492e
2016-06-02 10:33:44 +00:00
Android Build Merger (Role)
2fd085bb4f Merge "Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev am: e67a29a037" into nyc-mr1-dev 2016-06-02 10:28:56 +00:00
Mudumba Ananth
0d98ebf997 HFP 1.7 profile update (3/4)
-> Android Framework changes to add support for
   an API to send indicator change in AG.
-> Added a system intent for broadcasting assigned number(ID)
   of the supported HF indicators and their values (if received)

Bug: 19983867
Change-Id: If26a7ae5da5686da72ebca9ec3decfe086e2ffb6
2016-06-02 10:21:55 +00:00
Calin Juravle
dd2fc463f1 Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev
am: e67a29a037

* commit 'e67a29a037d11d242d6afba6aff5a0feb60e289b':
  Don't create or check permissions on profiles during app startup

Change-Id: I1b8f9e4dc894d50041d06e195753116593326af0
2016-06-02 10:18:13 +00:00
Calin Juravle
ae9f5b6559 Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev
am: e67a29a037

* commit 'e67a29a037d11d242d6afba6aff5a0feb60e289b':
  Don't create or check permissions on profiles during app startup

Change-Id: I43d0c4af8e20fabd3f752ce8ad97f4ad1f28dd1b
2016-06-02 10:18:06 +00:00
Calin Juravle
e67a29a037 Merge "Don't create or check permissions on profiles during app startup" into nyc-dev 2016-06-02 10:10:36 +00:00
Dianne Hackborn
9b78db41a0 Work on issue #29042642: Watchdog going off
Have FastPrintWriter note all cases where an exception is
thrown, and stop trying to push more data into the output
stream when this happens.

Change-Id: I51a1eeb26578f02b2a6f45ef7bc2513dfde702a2
2016-06-01 18:19:24 -07:00
Makoto Onuki
facbcba617 Merge "ShortcutManager: API rename" into nyc-mr1-dev
am: 60585d12e7

* commit '60585d12e717d6dd02c89cf177159dbb1c7b4fc9':
  ShortcutManager: API rename

Change-Id: Ieca236424835edf8b141706733b3bc98657547ab
2016-06-01 23:32:22 +00:00
Ta-wei Yen
cbf3aa8789 Merge "Add support for source-specific VVM state in VoicemailContract" into nyc-mr1-dev
am: 912e2b2c80

* commit '912e2b2c80ba7641f649ae7e130d9febc4caac44':
  Add support for source-specific VVM state in VoicemailContract

Change-Id: I0d0555fc9d2d4dfcee9a8cfb29acfe3a109be094
2016-06-01 23:26:31 +00:00
David Sehr
4fa0e17183 Merge "Installer connection support for dump_profiles" into nyc-dev am: 7c5bcfc21a
am: fc536cb862

* commit 'fc536cb862c67d91eaa7fa94557cdc2f0f415678':
  Installer connection support for dump_profiles

Change-Id: I6f8dbd362f6accc2d90409b91e96efed531820d9
2016-06-01 23:15:53 +00:00
Jeff Sharkey
c9c4fe2af9 Merge "Release AssetManagers when ejecting storage." into nyc-dev am: 380f3b12a4
am: 20340d0fc8

* commit '20340d0fc82bccf883898e9523f3c8aca8c9ac04':
  Release AssetManagers when ejecting storage.

Change-Id: I8053660edc7088f26c94fb2a3174a743a8d60636
2016-06-01 23:15:49 +00:00
Alex Klyubin
af53ef2308 Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev am: 7fe19060cf
am: 815c681f42

* commit '815c681f4243486693830929bf1be472ae1f467b':
  Use correct cert chain from PKCS#7 SignedData block.

Change-Id: I01cb9b5f0fb409d5f03120b6cdfca9077b7bceb2
2016-06-01 23:15:40 +00:00
Dianne Hackborn
727da2b880 Merge "Fix issue #29058724: Improve JobScheduler API demo" into nyc-dev am: 61721ee3d7
am: 56b70d51f4

* commit '56b70d51f45ecf101222d90a993f6f6da044ae65':
  Fix issue #29058724: Improve JobScheduler API demo

Change-Id: Ib1eeb21537446f7c7b7b99f30acf8713f07dd57f
2016-06-01 23:12:13 +00:00
David Sehr
fc536cb862 Merge "Installer connection support for dump_profiles" into nyc-dev
am: 7c5bcfc21a

* commit '7c5bcfc21ac87c56c57b1929ce04481fa0e116c7':
  Installer connection support for dump_profiles

Change-Id: I4085587ad80b04bc99efbe51c4480f193186a872
2016-06-01 23:04:25 +00:00
Jeff Sharkey
20340d0fc8 Merge "Release AssetManagers when ejecting storage." into nyc-dev
am: 380f3b12a4

* commit '380f3b12a4725a0534d62ada7c6f3bd67ebd0d01':
  Release AssetManagers when ejecting storage.

Change-Id: I92c0fcbe38dd242cb8a0a3792381de81a7c0384c
2016-06-01 23:04:09 +00:00
Alex Klyubin
815c681f42 Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev
am: 7fe19060cf

* commit '7fe19060cfaf09e8756f6488c5f2d6c7bbdd92ea':
  Use correct cert chain from PKCS#7 SignedData block.

Change-Id: I5f93eac591446733fe7188e149ad5c4d970a1ba3
2016-06-01 23:03:51 +00:00
David Sehr
2855609944 Merge "Installer connection support for dump_profiles" into nyc-dev
am: 7c5bcfc21a

* commit '7c5bcfc21ac87c56c57b1929ce04481fa0e116c7':
  Installer connection support for dump_profiles

Change-Id: I6cf3d4fe88577ef1d149c3c4b1c3ee7160d9c7e6
2016-06-01 23:03:50 +00:00
Jeff Sharkey
f02954ccd5 Merge "Release AssetManagers when ejecting storage." into nyc-dev
am: 380f3b12a4

* commit '380f3b12a4725a0534d62ada7c6f3bd67ebd0d01':
  Release AssetManagers when ejecting storage.

Change-Id: I54282cfcf53279f87e66cc1263ae9663fe94bc04
2016-06-01 23:03:38 +00:00
Dianne Hackborn
56b70d51f4 Merge "Fix issue #29058724: Improve JobScheduler API demo" into nyc-dev
am: 61721ee3d7

* commit '61721ee3d7b7d55a0535584449b49143b1c2e039':
  Fix issue #29058724: Improve JobScheduler API demo

Change-Id: I3f05621c5e18ca35104ac66f95a96a19c789612d
2016-06-01 22:48:59 +00:00
Makoto Onuki
60585d12e7 Merge "ShortcutManager: API rename" into nyc-mr1-dev 2016-06-01 22:44:11 +00:00
Alex Klyubin
5a347de60f Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev
am: 7fe19060cf

* commit '7fe19060cfaf09e8756f6488c5f2d6c7bbdd92ea':
  Use correct cert chain from PKCS#7 SignedData block.

Change-Id: Ieb7d6d212fe26ffa61aa6714ed8315b2c98bfe3d
2016-06-01 22:29:49 +00:00
David Sehr
7c5bcfc21a Merge "Installer connection support for dump_profiles" into nyc-dev 2016-06-01 22:16:05 +00:00
TreeHugger Robot
380f3b12a4 Merge "Release AssetManagers when ejecting storage." into nyc-dev 2016-06-01 22:14:57 +00:00
Alex Klyubin
7fe19060cf Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev 2016-06-01 21:55:05 +00:00
Ta-wei Yen
912e2b2c80 Merge "Add support for source-specific VVM state in VoicemailContract" into nyc-mr1-dev 2016-06-01 21:49:47 +00:00
Jeff Sharkey
98bf12f999 Release AssetManagers when ejecting storage.
When ejecting a storage device, the system process needs to rapidly
release any open FDs to prevent itself from being killed by vold.

This change examines all ResourceImpls cached inside the system
process and evicts any that reference the storage device being
ejected.  (ResourcesManager will gladly recreate any evicted entries
when asked again in the future.)

Also replace broken use of WeakHashMap, since we want the values to
be weak references, not the keys.

Bug: 28867548
Change-Id: Ib9cfc66497149b6d3f8d49213e9779408a331d2a
2016-06-01 14:52:27 -06:00
Ta-wei Yen
c75b215eb3 Add support for source-specific VVM state in VoicemailContract
Negative values of the field CONFIGURATION_STATE, DATA_CHANNEL_STATE,
NOTIFICATION_CHANNEL_STATE is reserved to voicemail source for its'
specific errors. SOURCE_TYPE can be set to help interpret the error
codes.

Typically the OMTP visual voicemail source will set SOURCE_TYPE to the
same value of visual voicemail type set with 
CarrierConfigManager.KEY_VVM_TYPE_STRING, such as "vvm_type_omtp".

For example, the OMTP visual voicemail source could set 
CONFIGURAITON_STATE to -5 and SOURCE_TYPE to "vvm_type_foo", and the
client can find -5 for "vvm_type_foo" means "PIN is not set by the user"

+ Field SOURCE_TYPE
+ Docs to specify negative values are reserved for the source
- Removed hidden helper method SetStatus() and SetQuota(). The 'ignore'
  value is conflicting with reserved values.

Bug:26944391
Change-Id: I0930f684dadd25ae94e3ea68a7658c7ae423e3e3
2016-06-01 20:04:57 +00:00
Dianne Hackborn
7aaeb394a9 Merge "Fix issue #29058724: Improve JobScheduler API demo" into nyc-dev
am: 61721ee3d7

* commit '61721ee3d7b7d55a0535584449b49143b1c2e039':
  Fix issue #29058724: Improve JobScheduler API demo

Change-Id: Icbee904b90fe52afaa8074b3165e4618d1fae526
2016-06-01 19:37:43 +00:00
Dianne Hackborn
61721ee3d7 Merge "Fix issue #29058724: Improve JobScheduler API demo" into nyc-dev 2016-06-01 19:29:43 +00:00