Commit Graph

61113 Commits

Author SHA1 Message Date
Felipe Leme
bd6a1fc76e Merge "Removed Intent.OPEN_EXTERNAL_DIRECTORY." into nyc-dev am: 014a0d11c7
am: ac6f61dd27

* commit 'ac6f61dd27c0a11b8ee8c3121849094ddb4bb9d9':
  Removed Intent.OPEN_EXTERNAL_DIRECTORY.
2016-02-17 23:56:52 +00:00
Felipe Leme
ba2707d9dc Merge "Initial implementation of StorageManager.getVolumesList()." into nyc-dev am: 3c3770d8fe
am: f3fb06dd3d

* commit 'f3fb06dd3da173011eb04ea1d44f498ac7cb1152':
  Initial implementation of StorageManager.getVolumesList().
2016-02-17 23:55:41 +00:00
Arunesh Mishra
de15666923 Merge "SoundTriggerHelper changes for GenericSoundModels." into nyc-dev am: df8d02b074
am: 9f43371bae

* commit '9f43371bae759ba773ef179f091d9d5fdf668cad':
  SoundTriggerHelper changes for GenericSoundModels.
2016-02-17 23:51:33 +00:00
Felipe Leme
ac6f61dd27 Merge "Removed Intent.OPEN_EXTERNAL_DIRECTORY." into nyc-dev
am: 014a0d11c7

* commit '014a0d11c7ac521b77c62278d31ce4d41c5f33b7':
  Removed Intent.OPEN_EXTERNAL_DIRECTORY.
2016-02-17 23:49:22 +00:00
Felipe Leme
f3fb06dd3d Merge "Initial implementation of StorageManager.getVolumesList()." into nyc-dev
am: 3c3770d8fe

* commit '3c3770d8fe9f64fc92de02f3e52901748e1f30de':
  Initial implementation of StorageManager.getVolumesList().
2016-02-17 23:47:27 +00:00
Arunesh Mishra
9f43371bae Merge "SoundTriggerHelper changes for GenericSoundModels." into nyc-dev
am: df8d02b074

* commit 'df8d02b07499d0def4a6761b793d4af329309254':
  SoundTriggerHelper changes for GenericSoundModels.
2016-02-17 23:44:56 +00:00
Felipe Leme
014a0d11c7 Merge "Removed Intent.OPEN_EXTERNAL_DIRECTORY." into nyc-dev 2016-02-17 22:43:20 +00:00
Felipe Leme
3c3770d8fe Merge "Initial implementation of StorageManager.getVolumesList()." into nyc-dev 2016-02-17 22:42:40 +00:00
Arunesh Mishra
df8d02b074 Merge "SoundTriggerHelper changes for GenericSoundModels." into nyc-dev 2016-02-17 22:42:34 +00:00
Felipe Leme
34a9d52719 Removed Intent.OPEN_EXTERNAL_DIRECTORY.
Such intent is now encapsulated by StorageVolume.createAccessIntent().

BUG: 26742218

Change-Id: I2e2bd71126ecd74981f77b0af7d069f51aaece74
2016-02-17 14:38:25 -08:00
Chad Brubaker
e84d7d6f3f Merge "Fix getAcceptedIssuers" into nyc-dev am: da449afbfe
am: 834038747d

* commit '834038747d7eb3eb2680713c32e6c6d40b3d04df':
  Fix getAcceptedIssuers
2016-02-17 22:38:07 +00:00
Chad Brubaker
834038747d Merge "Fix getAcceptedIssuers" into nyc-dev
am: da449afbfe

* commit 'da449afbfeac5d9d20e94d4c34e4d00b18b4b017':
  Fix getAcceptedIssuers
2016-02-17 22:28:18 +00:00
Arunesh Mishra
3fff7f5634 SoundTriggerHelper changes for GenericSoundModels.
- Refactoring SoundTriggerHelper to handle generic sound models.
     - Ability to store multiple models, callback and state information.
     - Separate out initialization to be done per voice model, per any model
     and per generic model.
 - Minor change to the API exposed -- removing the Handler from the
   createSoundTriggerDetector call.
 - Added callback processing for onRecognitionEvent().
 - Added logic for stopAll().
 - Changes to the SoundTriggerTestApp to start/stop recognition.
     - Multiple models (3).
     - Ability to start/stop/load/unload individual models.

Bug: 22860713
Bug: 27222043
Change-Id: Ie5d811babb956bead653fb560a43f1e549ed11bd
2016-02-17 14:24:03 -08:00
Amith Yamasani
f886598679 Merge "Clean up App Standby code" into nyc-dev am: 0137c3daf4
am: 4dcb319701

* commit '4dcb3197011c5fe75a3a39d436423689af27227a':
  Clean up App Standby code
2016-02-17 22:21:55 +00:00
Chad Brubaker
da449afbfe Merge "Fix getAcceptedIssuers" into nyc-dev 2016-02-17 22:20:36 +00:00
Amith Yamasani
4dcb319701 Merge "Clean up App Standby code" into nyc-dev
am: 0137c3daf4

* commit '0137c3daf4bdd3154b71d9b34536960c424fc422':
  Clean up App Standby code
2016-02-17 22:01:27 +00:00
Amith Yamasani
0137c3daf4 Merge "Clean up App Standby code" into nyc-dev 2016-02-17 21:50:32 +00:00
Amith Yamasani
ca5d6d2a81 Clean up App Standby code
Don't continue to check idle states for removed / stopped users.
No need to check for uninstalled packages for all users.

Bug: 27208519
Change-Id: I9a3a3bbec560dd380ce90df9fef102d7f62769ca
2016-02-17 13:36:48 -08:00
Tony Mak
dab9ccbfe9 Merge "[ContactsContract] Add new API PhoneLookup.CONTACT_ID and DATA_ID" into nyc-dev am: 181d907d24
am: cc5bd97810

* commit 'cc5bd9781038c4bf9b2edd07b482cdf50bc9af8b':
  [ContactsContract] Add new API PhoneLookup.CONTACT_ID and DATA_ID
2016-02-17 21:36:48 +00:00
Jorim Jaggi
b0a301396d Make sure we call reportResized exactly once when drag starting am: c662d8e946
am: ab3e290fe2

* commit 'ab3e290fe264ddc3874ebc96addb33c7a7ca3b1d':
  Make sure we call reportResized exactly once when drag starting
2016-02-17 21:28:06 +00:00
Tony Mak
cc5bd97810 Merge "[ContactsContract] Add new API PhoneLookup.CONTACT_ID and DATA_ID" into nyc-dev
am: 181d907d24

* commit '181d907d2416dcf780640f3c3fb13623acc187a1':
  [ContactsContract] Add new API PhoneLookup.CONTACT_ID and DATA_ID
2016-02-17 21:25:27 +00:00
Jorim Jaggi
ab3e290fe2 Make sure we call reportResized exactly once when drag starting
am: c662d8e946

* commit 'c662d8e94620c84b2fa57bfd6e45690f0c349d89':
  Make sure we call reportResized exactly once when drag starting
2016-02-17 21:18:23 +00:00
Felipe Leme
04a5d40cf3 Initial implementation of StorageManager.getVolumesList().
This change makes StorageManager.getVolumesList(),
StorageManager.getPrimaryVolume(),  and StorageVolume public and adds a
buildAccessIntent() in the latter to automatically generate the
ACTION_OPEN_EXTERNAL_DIRECTORY intent, but it doesn't change the
ACTION_OPEN_EXTERNAL_DIRECTORY implementation yet (i.e., it still takes an URI with the physical path of the directory, instead of a StorageVolume and
a directorny name).

BUG: 26742218

Change-Id: I36c59c42b6579e125ec7f03c3af141260875a491
2016-02-17 13:14:39 -08:00
Tony Mak
fd9ec5a600 [ContactsContract] Add new API PhoneLookup.CONTACT_ID and DATA_ID
It is a mistake that we put contact id in PhoneLookup._ID.
But for SIP query, the contact id is put in Data.CONTACT_ID instead.
For backward-compability issue, we can't revert the change, but to
save developer from having logic like below, PhoneLookup.CONTACT_ID is
introduced.

if (sip) {
    get contact id in Data.CONTACT_ID column
} else {
    get contact id in PhoneLookup._ID column
}

So for sip query, we put contact id in PhoneLookup.CONTACT_ID.
For other phone lookup query, we put contact id in both PhoneLookup.ID
and PhoneLookup.CONTACT_ID.

BUG:27149017

Change-Id: I4155da29bbacdda0d43164b0ce11c7224a4eee67
2016-02-17 21:08:09 +00:00
Jorim Jaggi
c662d8e946 Make sure we call reportResized exactly once when drag starting
If there was another layout happening before the app called
relayoutWindow(), we were issuing multiple reportResized calls,
leading to multiple relayoutWindow() calls, slowing everything
down.

Change-Id: I1f3da04bb7581c655567e1d1a6fe0f8c83c0ffda
2016-02-17 21:02:13 +00:00
Tao Bao
60e0644d60 Merge "Add a Settings option of "Disable automatic update"." into nyc-dev am: c86f234c51
am: a250308200

* commit 'a250308200542681c7409a394d8277afa203123d':
  Add a Settings option of "Disable automatic update".
2016-02-17 20:16:00 +00:00
Tao Bao
a250308200 Merge "Add a Settings option of "Disable automatic update"." into nyc-dev
am: c86f234c51

* commit 'c86f234c51ebcb78164d850177eb2143112f9f65':
  Add a Settings option of "Disable automatic update".
2016-02-17 20:09:51 +00:00
Tao Bao
c86f234c51 Merge "Add a Settings option of "Disable automatic update"." into nyc-dev 2016-02-17 20:06:52 +00:00
Chad Brubaker
efb4f91bdb Fix getAcceptedIssuers
Delegating to the TrustManagerImpl doesn't work correctly with
getAcceptedIssuers, do it in NetworkSecurityTrustManager instead.

Bug: 27124116
Change-Id: Ie527d63aaa115e6137396e07c7d134b1c42bfe87
2016-02-17 10:31:14 -08:00
Sunny Goyal
e4ef2f5160 Using AppWidgetHostView in RemoteViewsAdapter instead of managing the RemoteViews inflation itself
am: a086f0436a

* commit 'a086f0436ad600915db1f8e0dc284d653d152e8d':
  Using AppWidgetHostView in RemoteViewsAdapter instead of managing the RemoteViews inflation itself
2016-02-17 18:15:08 +00:00
Sunny Goyal
885d729bc0 Changing hashmaps to sparseArrays and other similar conversions
am: 4ea5484266

* commit '4ea548426666c736587a7fe5ad24ab03a3466cad':
  Changing hashmaps to sparseArrays and other similar conversions
2016-02-17 18:13:31 +00:00
Sunny Goyal
a086f0436a Using AppWidgetHostView in RemoteViewsAdapter instead of managing the RemoteViews inflation itself
Change-Id: If6dd8a778096a07c58b543efe892bbffbe24098f
(cherry picked from commit 89699a2811)
2016-02-17 18:08:46 +00:00
Sunny Goyal
4ea5484266 Changing hashmaps to sparseArrays and other similar conversions
Change-Id: I1905120a2dc109e8f383b973e599e2c23e005d0e
(cherry picked from commit c7ccff4b20)
2016-02-17 18:07:40 +00:00
Anna Galusza
0d0f4756d5 Merge "Expose Intent for launching screen reader tutorial." into nyc-dev am: 9f972de6e5
am: 747d8814a8

* commit '747d8814a8bb23dea66daed8123b5a498ecf0b50':
  Expose Intent for launching screen reader tutorial.
2016-02-17 18:06:51 +00:00
Steve McKay
2d9344d5d9 Merge "Remove "HOME" directory. Use "Documents" instead." into nyc-dev am: 25a7ee08f6
am: 40cc8409e1

* commit '40cc8409e1c0255e44ce3ca2818dae9f636f9c7a':
  Remove "HOME" directory. Use "Documents" instead.
2016-02-17 18:00:54 +00:00
Anna Galusza
747d8814a8 Merge "Expose Intent for launching screen reader tutorial." into nyc-dev
am: 9f972de6e5

* commit '9f972de6e59da095670c65c5936114da43b5ec1b':
  Expose Intent for launching screen reader tutorial.
2016-02-17 18:00:15 +00:00
Anna Galusza
9f972de6e5 Merge "Expose Intent for launching screen reader tutorial." into nyc-dev 2016-02-17 17:56:33 +00:00
Edward Cunningham
11b2f01262 Merge "DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details." into nyc-dev
am: e619e33b60

* commit 'e619e33b606dbdd885d5379a6f1fd60636ff59a2':
  DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details.
2016-02-17 17:55:21 +00:00
Steve McKay
40cc8409e1 Merge "Remove "HOME" directory. Use "Documents" instead." into nyc-dev
am: 25a7ee08f6

* commit '25a7ee08f6eaa1c0e9e2b2a0ef9b6fe8ecf5da23':
  Remove "HOME" directory. Use "Documents" instead.
2016-02-17 17:54:09 +00:00
Edward Cunningham
e619e33b60 Merge "DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details." into nyc-dev 2016-02-17 17:50:45 +00:00
Steve McKay
25a7ee08f6 Merge "Remove "HOME" directory. Use "Documents" instead." into nyc-dev 2016-02-17 17:46:24 +00:00
Yohei Yukawa
f71167b50a Merge "Add Copy-On-Write mode to InputMethodSettings." into nyc-dev am: 93dfc03ba6
am: 92721fedfb

* commit '92721fedfb335d1c7b9f6abc40ab83a778c25098':
  Add Copy-On-Write mode to InputMethodSettings.
2016-02-17 17:23:28 +00:00
Yohei Yukawa
92721fedfb Merge "Add Copy-On-Write mode to InputMethodSettings." into nyc-dev
am: 93dfc03ba6

* commit '93dfc03ba632590e30604dde31b78628df962eff':
  Add Copy-On-Write mode to InputMethodSettings.
2016-02-17 17:17:15 +00:00
Yohei Yukawa
93dfc03ba6 Merge "Add Copy-On-Write mode to InputMethodSettings." into nyc-dev 2016-02-17 17:11:54 +00:00
Yohei Yukawa
68645a638a Add Copy-On-Write mode to InputMethodSettings.
This is a preparation for File-Based Encryption (FBE) support in IMMS.

In order to support File-Based Encryption (FBE), IMMS needs to reset
its internal state exactly when the device is unlocked by user first
time. This is important because IMMS would recognize only
encryption-aware input method services until the the device is unlocked
by the current user.

Even if we reset the internal state when the device is unlocked by the
current user, there are still two tricky points.

 1. Except for the initial boot, IMMS uses Secure Settings to determine
    what IMEs are enabled and what IME is currently selected.  These
    persistent state may not be suitable for the situation where the
    device is not unlocked yet, because some of IMEs referenced there
    may or may not be encryption-aware.  Depending on the situations,
    we may need to enable at least one encryption-aware IME to ensure
    that the user is able to type password to unlock the device, even if
    such an IME is not Settings.Secure.ENABLED_INPUT_METHODS.  We have
    to be careful when doing this because we don't want non
    pre-installed IMEs to be enabled until the user approves it.
 2. IMMS tends to save its internal state into Secure Settings.
    However, because of the point 1, we may need to automatically enable
    a certain IME to make sure the user is able to type even when the
    device is not unlocked yet.  We don't want such a temporary state
    to be persistent in Secure Settings.

The basic idea of this CL is to implement Copy-On-Write (COW) mode in
InputMethodSettings so that we can later discard any changes made before
the device is unlocked.  As the initial step, we start using this COW
mode until the the ActivityManager becomes ready.  With this change we
can revert a previous commit [1] for Bug 6685037, where forward-locked
encrypted apks need to be taken care of an early boot phase.

  [1] Ifb311f85154beadd4787ec73669bedfdf1f5172d
      4c0e7152e7

Bug: 26279466
Change-Id: I9c6f9bb3d51174198e5f73588637f87ea0d90e11
2016-02-17 07:54:20 -08:00
Julia Reynolds
6e0498b342 Merge "Alarm can end time-based rule." into nyc-dev am: 7caa0b8724
am: 835a2a1f6c

* commit '835a2a1f6ce2e3936d4cb2411312efd37403f639':
  Alarm can end time-based rule.
2016-02-17 15:34:31 +00:00
Andrei Stingaceanu
6cc3a00f96 Merge "Suspend packages - one call for multiple packages" into nyc-dev am: 3e7bfe98e0
am: cb4634aa72

* commit 'cb4634aa72c8435705e41d7b0bf714b5c276022e':
  Suspend packages - one call for multiple packages
2016-02-17 15:30:07 +00:00
Julia Reynolds
835a2a1f6c Merge "Alarm can end time-based rule." into nyc-dev
am: 7caa0b8724

* commit '7caa0b872479fef4067fbc1f824ca184addf9c37':
  Alarm can end time-based rule.
2016-02-17 15:27:48 +00:00
Andrei Stingaceanu
cb4634aa72 Merge "Suspend packages - one call for multiple packages" into nyc-dev
am: 3e7bfe98e0

* commit '3e7bfe98e0727f54fe369bfa6b416e1d040830a7':
  Suspend packages - one call for multiple packages
2016-02-17 15:23:54 +00:00
Julia Reynolds
7caa0b8724 Merge "Alarm can end time-based rule." into nyc-dev 2016-02-17 15:20:10 +00:00