Commit Graph

236306 Commits

Author SHA1 Message Date
Paul McLean
c4e4176bbd Merge "Remove redundant stop() from native audiotrack release." into nyc-dev
am: ca8772377e

* commit 'ca8772377e519736feb438d40fff4d8c1825ca06':
  Remove redundant stop() from native audiotrack release.
2016-03-07 17:14:48 +00:00
Kenny Guy
e71699e2ca Merge "Don\'t crash if KeyChain can\'t be bound to." into nyc-dev
am: fdadb4b475

* commit 'fdadb4b47590d2e93caa88d3a7dbe81584a7c528':
  Don't crash if KeyChain can't be bound to.
2016-03-07 17:08:47 +00:00
Geoff Mendal
51a35cf245 Import translations. DO NOT MERGE
am: 00694afd43  -s ours

* commit '00694afd434cb5e23f4021181511efbe1910ee48':
  Import translations. DO NOT MERGE
2016-03-07 17:04:09 +00:00
Paul Mclean
ca8772377e Merge "Remove redundant stop() from native audiotrack release." into nyc-dev 2016-03-07 14:30:24 +00:00
Kenny Guy
fdadb4b475 Merge "Don't crash if KeyChain can't be bound to." into nyc-dev 2016-03-07 14:07:43 +00:00
Kenny Guy
1145cd26bd Don't crash if KeyChain can't be bound to.
KeyChain can throw an assertion error if
is not around, don't allow that to take down
system.

Bug: 27518175
Change-Id: I99418dfb65c58d3e07cbda91860cdb493b96a836
2016-03-07 13:59:56 +00:00
Geoff Mendal
00694afd43 Import translations. DO NOT MERGE
Change-Id: Ic74d711aa527bd6696c8ea4f79d251426265941b
Auto-generated-cl: translation import
2016-03-07 08:25:10 -05:00
Michal Karpinski
a2a0e8b48b Merge "Do not re-define remote bugreport constants defined in DevicePolicyManager" into nyc-dev
am: a586c55dc9

* commit 'a586c55dc9fa910b227f1c228ba0fd17d4fb449b':
  Do not re-define remote bugreport constants defined in DevicePolicyManager
2016-03-07 11:05:41 +00:00
Michal Karpinski
a586c55dc9 Merge "Do not re-define remote bugreport constants defined in DevicePolicyManager" into nyc-dev 2016-03-07 11:02:20 +00:00
Daichi Hirono
888f70f569 Fix null pointer exception in DocumentLoader.
am: 37a655aac1

* commit '37a655aac1d61ce2fe346531f78cbcfbf51388e9':
  Fix null pointer exception in DocumentLoader.
2016-03-07 10:55:02 +00:00
Daichi Hirono
37a655aac1 Fix null pointer exception in DocumentLoader.
BUG=27489909

Change-Id: I1ebc9953f6db6639241d0c46257d110c5b0eb5b0
2016-03-07 19:41:10 +09:00
Diego Perez
d1c05c50ba Add support for GradientColor in layoutlib
am: 566b303365

* commit '566b303365078fac9a454f1595add19e02631db3':
  Add support for GradientColor in layoutlib
2016-03-07 09:19:28 +00:00
Diego Perez
566b303365 Add support for GradientColor in layoutlib
Change-Id: Ia9a55a9e00d7ddb5263f3dbe46b5da8dde457526
2016-03-07 09:11:11 +00:00
Insun Kang
f6e1f29da9 Merge "Fix wrong metadata conversion in MediaSessionLegacyHelper" into nyc-dev
am: bf8ff76fee

* commit 'bf8ff76fee7cbf3d2002207f3eb52eb58014c6ad':
  Fix wrong metadata conversion in MediaSessionLegacyHelper
2016-03-07 06:35:51 +00:00
Insun Kang
bf8ff76fee Merge "Fix wrong metadata conversion in MediaSessionLegacyHelper" into nyc-dev 2016-03-07 06:31:22 +00:00
Daichi Hirono
260bfd5af1 Merge "Ensure to complete background thread of PipeManager." into nyc-dev
am: a30918dc26

* commit 'a30918dc26876a16ee2a56d2549806f0b5291e2c':
  Ensure to complete background thread of PipeManager.
2016-03-07 04:59:56 +00:00
Daichi Hirono
a30918dc26 Merge "Ensure to complete background thread of PipeManager." into nyc-dev 2016-03-07 04:54:07 +00:00
Yohei Yukawa
df728e95c1 Merge "Use Java7 diamond operator in TSMS." into nyc-dev
am: e95ba66be0

* commit 'e95ba66be00090a9fba1e74cba3504e67177bdf4':
  Use Java7 diamond operator in TSMS.
2016-03-07 02:56:07 +00:00
Keisuke Kuroyanagi
a1fd59019e Merge "Try to find equivalent SuggestionsSpan when it has been updated." into nyc-dev
am: 15ae7c1328

* commit '15ae7c132866d401be4cdc88ac2d16a104d54b11':
  Try to find equivalent SuggestionsSpan when it has been updated.
2016-03-07 02:53:47 +00:00
Yohei Yukawa
e95ba66be0 Merge "Use Java7 diamond operator in TSMS." into nyc-dev 2016-03-07 02:50:04 +00:00
Keisuke Kuroyanagi
15ae7c1328 Merge "Try to find equivalent SuggestionsSpan when it has been updated." into nyc-dev 2016-03-07 02:48:17 +00:00
Jaewan Kim
1555fb31b0 Merge "PIP: Apply the latest UI spec for overlay text" into nyc-dev
am: 39c0921b45

* commit '39c0921b455721ab0678a5e49e9ceed2776010ad':
  PIP: Apply the latest UI spec for overlay text
2016-03-07 01:27:57 +00:00
Jaewan Kim
39c0921b45 Merge "PIP: Apply the latest UI spec for overlay text" into nyc-dev 2016-03-07 01:22:56 +00:00
Yohei Yukawa
074637f162 Use Java7 diamond operator in TSMS.
This CL changes nothing except for deleting redundant type parameters by
using diamond operator in TextServicesManagerService (TSMS).

No behavior change is intended.

Bug: 27456430
Change-Id: I18708fe44d2d9edfef8c1cf7cffef1bb0b5c003a
2016-03-06 14:34:55 -08:00
Yohei Yukawa
f5bb8abc46 Revert "Introduce script matching for enabling default IME subtypes."
am: 77dd59fc2a

* commit '77dd59fc2a0db94f0c58e17097fd6f07c1b5db8c':
  Revert "Introduce script matching for enabling default IME subtypes."
2016-03-06 06:03:22 +00:00
Yohei Yukawa
77dd59fc2a Revert "Introduce script matching for enabling default IME subtypes."
This reverts commit 9e7a1c9824.

Seems that that CL causes ArrayIndexOutOfBoundsException when
initializing InputMethodManagerService, which results in an infinite
boot animation.

Bug: 27129703
Bug: 27348943
Change-Id: I474a87876670ac018c675ac7b4608e90fbb2434b
2016-03-05 21:46:20 -08:00
Wale Ogunwale
cf5cd18ce6 Merge "Don\'t make home stack visible if starting activity isn\'t translucent" into nyc-dev
am: b1c23e2cf7

* commit 'b1c23e2cf7de552359febe879cfe42649b199822':
  Don't make home stack visible if starting activity isn't translucent
2016-03-06 04:21:04 +00:00
Wale Ogunwale
b1c23e2cf7 Merge "Don't make home stack visible if starting activity isn't translucent" into nyc-dev 2016-03-06 04:16:45 +00:00
Wale Ogunwale
8051c5c890 Don't make home stack visible if starting activity isn't translucent
We allow the home stack to be visible right behind the fullscreen
stack if all the activities fullscreen stack are translucent and
visible. However, if we are starting an acitvity it isn't visible
yet so our check for translucent activities in the fullscreen
stack will return true since there is nothing visible. This will
cause the home stack to the visible and the visiblilty of its app
token set to true in window manager and it been factored into the
transition animation.

In addition to checking if the activity is visible, we now also
check if it is the starting activity when trying to determine if
the stack is translucent.

Bug: 27448511
Change-Id: Icbbd57c0632cc5389c7ac894800a41f75d4bc450
2016-03-05 19:18:30 -08:00
Seigo Nonaka
e82af2f831 Merge "Introduce script matching for enabling default IME subtypes." into nyc-dev
am: d22b31bef7

* commit 'd22b31bef7c5bca59225eb61b0b0870b82470afa':
  Introduce script matching for enabling default IME subtypes.
2016-03-06 03:07:50 +00:00
Seigo Nonaka
d22b31bef7 Merge "Introduce script matching for enabling default IME subtypes." into nyc-dev 2016-03-06 03:02:26 +00:00
Jeff Sharkey
f8dfd32d31 Merge "Skip publishContentProviders() when we have zero." into nyc-dev
am: 2d4d61d326

* commit '2d4d61d3268a1f1af6b0835eb346bec587983050':
  Skip publishContentProviders() when we have zero.
2016-03-06 02:54:53 +00:00
Seigo Nonaka
9e7a1c9824 Introduce script matching for enabling default IME subtypes.
The motivation of this CL is enhance the default IME subtype enabling
algorithm.  The new approach is done by score based algorithm.  The
design of the matching score is determined as follows:
- The matching score for the each two locale is up to 3 and determined
  as follows:
  - Score of 3 : matches all language, script and country.
  - Score of 2 : matches the language and script.
  - Score of 1 : matches the language regardless of country.
  - Score of 0 : doesn't match the language regardless of script and
                 country.
- All locales are fully expanded before matching by addLikelySubtags in
  ICU.

Bug: 27129703
Change-Id: I5bb1bd8cdb9096d516d60beb9936e55bf2b757ae
2016-03-05 18:52:59 -08:00
Jeff Sharkey
2d4d61d326 Merge "Skip publishContentProviders() when we have zero." into nyc-dev 2016-03-06 02:50:32 +00:00
Jeff Sharkey
3e1958936e Skip publishContentProviders() when we have zero.
If the list of providers for the application being bound is empty,
don't bother trying to register them.

Bug: 27510621
Change-Id: I921fb70a4c97433fa123fa88e170745ee013ee35
2016-03-05 19:49:02 -07:00
Jeff Sharkey
6102dca518 Merge "Set default ringtones through RingtoneManager." into nyc-dev
am: 0f905b3db2

* commit '0f905b3db2494b1e858cbc135a782e5663847b65':
  Set default ringtones through RingtoneManager.
2016-03-06 00:56:37 +00:00
Guang Zhu
c7fb58d485 Merge "fix DocumentsUI tests makefile" into nyc-dev
am: 913794b02b

* commit '913794b02b44541e41ddcadf744018712ef2f980':
  fix DocumentsUI tests makefile
2016-03-06 00:54:40 +00:00
Jeff Sharkey
0f905b3db2 Merge "Set default ringtones through RingtoneManager." into nyc-dev 2016-03-06 00:50:20 +00:00
Guang Zhu
913794b02b Merge "fix DocumentsUI tests makefile" into nyc-dev 2016-03-06 00:48:36 +00:00
Guang Zhu
c5a511ad0c fix DocumentsUI tests makefile
For instrumentation test apks, it should not statically include
Java libraries that are already present in the app module being
instrumented. They only need to be on classpath during compile
time.

Bug: 26689464
Change-Id: I68d4be95e30ae70bbab23d016a87eb085c10cc50
2016-03-06 00:47:59 +00:00
Jeff Sharkey
9dd3b2162d Set default ringtones through RingtoneManager.
RingtoneManager is the public API that everyone should be going
through, and it now has the side-effect of caching the set ringtone
to make it available before CE storage is unlocked.

Bug: 27435331
Change-Id: I30ed4e2df2ef1e4fd47f947c70845aaa74356384
2016-03-05 17:43:22 -07:00
Jeff Sharkey
12e2778307 Merge "Ask RingtonePlayer to open data for caching." into nyc-dev
am: b94f2df289

* commit 'b94f2df289f4289f1eca7206f3d1bcdd737e69a6':
  Ask RingtonePlayer to open data for caching.
2016-03-06 00:32:25 +00:00
Jeff Sharkey
b94f2df289 Merge "Ask RingtonePlayer to open data for caching." into nyc-dev 2016-03-06 00:29:01 +00:00
Jeff Sharkey
783ee0ca87 Ask RingtonePlayer to open data for caching.
When setting default ringtones, RingtoneManager now caches the
selected media for playback before the device is unlocked.  However,
this API hasn't historically required the caller to hold storage
permissions.

To keep this working, we attempt to delegate ringtone access over
through RingtonePlayer, which is what we do for playback.  However,
because we're caching the real ringtone bits now, we need to be much
more careful about the PFDs we're willing to return.  This change
requires that they be in external storage, and that they have the
ringtone/alarm/notification bit set.

Bug: 27366059
Change-Id: I59c2adc1d1250a3eac281f190f35a7cb3119967b
2016-03-05 17:23:32 -07:00
Jeff Sharkey
24219954ec Merge "Add AssetFileDescriptor to MediaExtractor." into nyc-dev
am: d6de3abed9

* commit 'd6de3abed92ae88154da731e6c0030b3a8d3d8ee':
  Add AssetFileDescriptor to MediaExtractor.
2016-03-05 23:15:10 +00:00
Jeff Sharkey
d6de3abed9 Merge "Add AssetFileDescriptor to MediaExtractor." into nyc-dev 2016-03-05 23:09:25 +00:00
Jeff Sharkey
a3c1c2297d Add AssetFileDescriptor to MediaExtractor.
Mirrors API on MediaPlayer.

Bug: 27506874
Change-Id: Ibc07cf8151c362ff7375b89e7a9044bef1d9e94d
2016-03-05 16:07:46 -07:00
Jeff Sharkey
e741feb79b Merge "Kick Bluetooth stack after user is unlocked." into nyc-dev
am: 3457871799

* commit '3457871799a81644711d7d3c302f0d34d2f2e591':
  Kick Bluetooth stack after user is unlocked.
2016-03-05 22:31:46 +00:00
Jeff Sharkey
3457871799 Merge "Kick Bluetooth stack after user is unlocked." into nyc-dev 2016-03-05 22:28:34 +00:00
Jeff Sharkey
aacb89e929 Kick Bluetooth stack after user is unlocked.
If Bluetooth was enabled at boot time, but the actual Bluetooth
package wasn't encryption aware, we need to kick off another enabled
pass once the user is unlocked.

Bug: 27326711
Change-Id: I511c4fd8567792e5bc4d49fa95929fd87edd0fbf
2016-03-05 15:00:52 -07:00