309872 Commits

Author SHA1 Message Date
Jerome Gaillard
ce29b88233 Merge "Update layoutlib following Change Ia12d448a" 2017-03-07 17:11:16 +00:00
Andreas Gampe
19f1844e7e Merge "Framework: Ensure image heap string literals for Patterns" am: d0f092af84 am: 838851364b
am: 5fe3eb7696

Change-Id: Ia0bf25c740eedee436436e573241a59685db2fbd
2017-03-07 17:08:43 +00:00
Andreas Gampe
5fe3eb7696 Merge "Framework: Ensure image heap string literals for Patterns" am: d0f092af84
am: 838851364b

Change-Id: I0b19a98ca157d87c41a3a305b9ae59bb65a9cffe
2017-03-07 17:03:51 +00:00
Etan Cohen
a123f73a1c Merge "[CM] Allow timeout in request network" am: 8328f27a87 am: 645b48c8af
am: ac879cbcaf

Change-Id: If42250966d619073d45d608aab454589213b1756
2017-03-07 17:02:05 +00:00
Andreas Gampe
838851364b Merge "Framework: Ensure image heap string literals for Patterns"
am: d0f092af84

Change-Id: I69886924b3aca6c050239069c00e166142e2e522
2017-03-07 16:59:12 +00:00
Tobias Thierer
ab9211b8e3 Merge "Track: ICU TimeZone: publish TIMEZONE_* constants" am: aa4877e295 am: b96d428e40
am: 6779441da0

Change-Id: Ib6b611e88dc342d5ce28e5594db142d54b840c20
2017-03-07 16:55:59 +00:00
Etan Cohen
ac879cbcaf Merge "[CM] Allow timeout in request network" am: 8328f27a87
am: 645b48c8af

Change-Id: Ie3438ba967887ab7776eefaf05a6cf915e866f82
2017-03-07 16:55:59 +00:00
Treehugger Robot
d0f092af84 Merge "Framework: Ensure image heap string literals for Patterns" 2017-03-07 16:50:59 +00:00
Etan Cohen
645b48c8af Merge "[CM] Allow timeout in request network"
am: 8328f27a87

Change-Id: Ic7a3da0a5292be5e13abca9c98c422bc2f50f3a0
2017-03-07 16:49:53 +00:00
Tobias Thierer
6779441da0 Merge "Track: ICU TimeZone: publish TIMEZONE_* constants" am: aa4877e295
am: b96d428e40

Change-Id: Ie91a466fa5e774cb5cb64361f00bb29643805cf0
2017-03-07 16:49:38 +00:00
Peeyush Agarwal
2ef1d0cfca Store alphaChar as lower case in MenuItem's implementations
We should be working with lowercase everywehre (since SHIFT is also a
modifier). Also, in findItemsWithShortcutForKey, we only compare the
character against the lower case version of key pressed (and not the
upper case version).

Bug: 35992521
Test: Manual
Change-Id: I01f24afc5f6c9ef55d477806a64a4a1ec262f28a
2017-03-07 16:48:00 +00:00
Tobias Thierer
b96d428e40 Merge "Track: ICU TimeZone: publish TIMEZONE_* constants"
am: aa4877e295

Change-Id: I94edc483a5d9dfeabb19d0eb687c10ba2df6eac9
2017-03-07 16:43:16 +00:00
Etan Cohen
8328f27a87 Merge "[CM] Allow timeout in request network" 2017-03-07 16:40:27 +00:00
Tobias Thierer
093572cd1b Don't allow MapCollections to iterate past the end.
Prior to this CL, MapCollections such as ArrayMap's entrySet,
keySet and values, exhibited unusual Iterator behavior:
 - instead of throwing NoSuchElementException once the end of
   the Collection was reached, Iterator.next() instead returned
   a null key / a null value / an entry with a null key and value.
 - however, remove() removed the last actual element of the
   Collection; successive calls of next(), remove() would
   result in successive elements being removed, in reverse
   iteration order.
 - Once the Collection had been cleared through calls to remove(),
   ArrayIndexOutOfBoundsException was thrown from iterator.next()
   (for keySet and values) or from iterator.remove (for entrySet).

This CL fixes those Collections' Iterators to let next() throw
NoSuchElementException when hasNext() would have returned false.
Since the new behavior was already guaranteed by the Iterator
documentation, any app compatibility effect from this CL is both
unlikely, and unlikely to be negative.

Bug: 19853326
Test: make cts && cts-tradefed run cts -m CtsUtilTestCases
Change-Id: Ie3f0594f434dd5625799791829bd94fbaef94906
2017-03-07 16:38:43 +00:00
Tobias Thierer
aa4877e295 Merge "Track: ICU TimeZone: publish TIMEZONE_* constants" 2017-03-07 16:35:17 +00:00
TreeHugger Robot
c7eefdbda7 Merge "Framework: Avoid string allocations" 2017-03-07 16:02:54 +00:00
Chris Wren
f33926abed remove the last of the legacy log helpers
All logs should now flow through LogMaker.

Bug: 34705522
Test: mmma -j20 platform_testing/tests/functional/notificationtests && adb install -r -g /data/app/NotificationFunctionalTests/NotificationFunctionalTests.apk && adb shell am instrument -w -e iterations 1 -e class com.android.notification.functional.NotificationInteractionTests com.android.notification.functional/android.support.test.runner.AndroidJUnitRunner && runtest --path platform_testing/libraries/metrics-helper/tests
Change-Id: I94732c84564e4cb25d77b63be8beb4aab4c38985
2017-03-07 10:49:07 -05:00
Chris Wren
a7c1b80f5f add clear methods to LogMaker
To support object reuse.

Test: runtest --path frameworks/base/core/tests/coretests/src/android/metrics
Bug: 36020746
Change-Id: I09e5689da70963e9aba3bd8428a55acfcbe4e92a
2017-03-07 10:41:39 -05:00
Julia Reynolds
d373d78d15 Log notification channels and groups.
Test: manual, runtest systemui-notification
Change-Id: I326a35ae87e7a3dc4b2587271056b7dd5cd11f8d
2017-03-07 15:25:27 +00:00
Clara Bayarri
3c4be77db9 Support non-system Font Providers
To do this, the developer must specify the set of certificate
hashes that represent the authority's app. This allows us to
verify that the authority we find is indeed the one intended
by the developer.

Bug: 35025705
Test: runtest --path frameworks/base/core/tests/coretests/src/android/provider/FontsContractTest.java
runtest --path frameworks/base/core/tests/coretests/src/android/content/res/FontResourcesParserTest.java
CTS attached to topic
Change-Id: I605f9a93bbca8705936ead08efb4a5b4fdcc4882
2017-03-07 14:59:33 +00:00
Gustav Sennton
4cbfe71bba Update WebView.getCurrentWebViewPackage documentation.
Explain when a WebView implementation change can occur, and what happens
when it occurs.

Bug: 35764852
Test: None (java-doc change).
Change-Id: I2d2bcccc2f16bc911636373bb47c64d846f15b2d
2017-03-07 14:33:13 +00:00
Abodunrinwa Toki
4cfda0beef TextClassifier: Introduce LocaleList in the API.
Test: API change. Ensured that tests (see topic) compiles
Bug: 35257733
Change-Id: I036af7948fcd691b8a7de586a9cc1b3165946f8a
2017-03-07 14:25:21 +00:00
Paul Duffin
9df5d4f715 Replace usages of littlemock with mockito
Littlemock appears to have been created as an alternative to
Mockito that would work on Android. Given that Mockito does
now work on Android and Littlemock has had no activity since
Aug 2012 it seems prudent to switch over to use Mockito instead.

https://code.google.com/archive/p/littlemock/

This is being done as part of the work to upgrade Mockito.

Bug: 32912773
Test: Build and install affected APKs, test using am instrument
Change-Id: Id0e57880ea66c5681b664bbfb534c96410544665
2017-03-07 13:55:52 +00:00
Erik Kline
a33ae2d884 Merge "request{LinkProperties,NetworkCapabilities} no longer needed" am: 75dfc5bd91 am: 0f901af920
am: bb54baba04

Change-Id: Id2aa8aeff6d299edb85955c12ab0a04023458597
2017-03-07 13:42:11 +00:00
Erik Kline
bb54baba04 Merge "request{LinkProperties,NetworkCapabilities} no longer needed" am: 75dfc5bd91
am: 0f901af920

Change-Id: I891abf2a1a4138b9d80b8544ac6d09deda8d3d62
2017-03-07 13:38:07 +00:00
Erik Kline
0f901af920 Merge "request{LinkProperties,NetworkCapabilities} no longer needed"
am: 75dfc5bd91

Change-Id: I79b9323be242ed5d2bf83962f78c613a465a20b8
2017-03-07 13:33:29 +00:00
Treehugger Robot
75dfc5bd91 Merge "request{LinkProperties,NetworkCapabilities} no longer needed" 2017-03-07 13:27:11 +00:00
Abodunrinwa Toki
0f502cb1b6 Merge "Prevent crashes when in insertion mode." 2017-03-07 12:54:52 +00:00
Jerome Gaillard
013edba605 Update layoutlib following Change Ia12d448a
Test: layoutlib tests
Change-Id: I66632bcef3a05d3d89e7fc6a37f099100feed0ad
2017-03-07 12:34:37 +00:00
Rubin Xu
c068aa2209 Merge "Allow user with a profile owner to have escrow tokens" 2017-03-07 10:59:53 +00:00
Erik Kline
465c46d555 request{LinkProperties,NetworkCapabilities} no longer needed
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - manual USB tethering toggling between WiFi and mobile
Bug: 32163131
Change-Id: I57edf5114b6361f320577c7870e40f8b3cdf74ce
2017-03-07 17:18:06 +09:00
Erik Kline
a1d0c089d2 Merge "Handle null NetworkState updates" am: ae758b2c7f am: 4cf8f7a8cd
am: b48eb4f71a

Change-Id: Idd5cf1b8de35cca3a7518d6ed76d87044c8846b4
2017-03-07 06:40:24 +00:00
Erik Kline
b48eb4f71a Merge "Handle null NetworkState updates" am: ae758b2c7f
am: 4cf8f7a8cd

Change-Id: I47cdb040baed8c4c700ff7412a01d79f8edccbd2
2017-03-07 06:36:13 +00:00
Erik Kline
4cf8f7a8cd Merge "Handle null NetworkState updates"
am: ae758b2c7f

Change-Id: I9d8d5c176804344a40f6646acf65d2d8a5cd976f
2017-03-07 06:31:48 +00:00
Treehugger Robot
ae758b2c7f Merge "Handle null NetworkState updates" 2017-03-07 06:24:17 +00:00
Erik Kline
6bbefcbf40 Merge "Always send all available state when calling onAvailable()." am: affbb8b6a9 am: e0a62a4398
am: 3765538bab

Change-Id: Ic82e3cb92841ea99972faad6ae004d77c725831b
2017-03-07 06:08:40 +00:00
Erik Kline
3765538bab Merge "Always send all available state when calling onAvailable()." am: affbb8b6a9
am: e0a62a4398

Change-Id: Ie9bd779526e967790cbc51de52a64bbf7cd493a5
2017-03-07 06:04:13 +00:00
Erik Kline
e0a62a4398 Merge "Always send all available state when calling onAvailable()."
am: affbb8b6a9

Change-Id: I81e70fecf060a4103b51084a60a32c78f6219f6b
2017-03-07 06:00:09 +00:00
Treehugger Robot
affbb8b6a9 Merge "Always send all available state when calling onAvailable()." 2017-03-07 05:51:41 +00:00
TreeHugger Robot
7cae77b606 Merge changes Iefcaf262,I9c397d83
* changes:
  Fixed a bug where the expand icon could show but nothing happens
  Improved expand accessibility experience
2017-03-07 05:44:54 +00:00
TreeHugger Robot
25e98e3c92 Merge "Waiting for reinflating the notifications until the user switched" 2017-03-07 05:24:11 +00:00
Winson Chung
192b50d518 Merge "Small fixes and tweaks to PiP transition." 2017-03-07 05:02:17 +00:00
Winson Chung
f4284638c4 Merge "Update how PIP size is determined" 2017-03-07 05:01:23 +00:00
Winson Chung
6c83d23088 Merge "Initial changes to support expanded PiP" 2017-03-07 05:00:59 +00:00
TreeHugger Robot
4540811b4d Merge "AOD: Refactor always on configuration" 2017-03-07 04:40:30 +00:00
Erik Kline
34baa3da4e Handle null NetworkState updates
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - manual USB tethering to WiFi and mobile switching works
Bug: 32163131
Change-Id: I2d4ef7c135ae6eb50cc31236f2fd20080536ea6a
2017-03-07 13:17:53 +09:00
TreeHugger Robot
8cfea13985 Merge "Move requestKeyboardShortcuts intent to com.android" 2017-03-07 03:59:47 +00:00
Erik Kline
c75d4fad22 Always send all available state when calling onAvailable().
The state that needs to be transferred includes:
    - NetworkCapabilities
    - LinkProperties
    - whether the network is currently suspended

Additionally:
    - Rename notifyNetworkCallback() to notifyNetworkAvailable()
      in order to clarify its real function.
    - fix previous copy/paste error in unittest

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - USB tethering with mobile and Wi-Fi upstream toggling
Bug: 32163131
Change-Id: Ib4460bcd5d08863a9feac9e8ab41a238897bb3ea
2017-03-07 12:57:26 +09:00
Romain Guy
efb4b06493 Add ColorSpace information on Bitmap
This is the first step toward interpreting color spaces at render time.

Bug: 32984164
Test: BitmapColorSpaceTest in CtsGraphicsTestCases

Change-Id: I0164a18f1ed74a745874fe5229168042afe27a04
2017-03-06 19:33:25 -08:00
Tyler Gunn
356322fb1e Merge "API review cleanups/changes." am: 9324d6513b am: dd4bc7c69c
am: c49b011151

Change-Id: Ib3d76474bef8c911b2ec6a61b916e38af0a3b861
2017-03-07 03:05:23 +00:00