314829 Commits

Author SHA1 Message Date
Julia Reynolds
00ac29e3dd Merge "Synchronize access to ranking helper records." into oc-dev
am: bf777d46f2

Change-Id: I36dec49a567400d1acf6e13567de3f76319f91be
2017-04-14 18:56:18 +00:00
TreeHugger Robot
bf777d46f2 Merge "Synchronize access to ranking helper records." into oc-dev 2017-04-14 18:52:40 +00:00
Hall Liu
00cf4637d2 Merge "Helper method in VideoCallImpl for testing" am: 14d27fccad
am: 8fa1c9c899

Change-Id: I148108bcf8636d553852201b0a70e9cfc97d7d44
2017-04-14 18:43:19 +00:00
Hall Liu
8fa1c9c899 Merge "Helper method in VideoCallImpl for testing"
am: 14d27fccad

Change-Id: I5e298b40a83041d759e9e5c59d51be0ec5450d11
2017-04-14 18:39:18 +00:00
Julia Reynolds
7e0a00e387 Merge "Lock access to managed services." into oc-dev
am: 8ac1452288

Change-Id: I425a6ee8a3f89149e87ce8269d679acc27363793
2017-04-14 18:34:01 +00:00
Hall Liu
14d27fccad Merge "Helper method in VideoCallImpl for testing" 2017-04-14 18:30:26 +00:00
Matt Sarett
7e92ac449b Merge "Bug fix: use legacy SkCanvas regardless of color space tag" into oc-dev
am: 101dc265a8

Change-Id: Ia6d620a6f4df4e7fdbceae5a6f3bc524aae4358e
2017-04-14 18:29:16 +00:00
TreeHugger Robot
8ac1452288 Merge "Lock access to managed services." into oc-dev 2017-04-14 18:28:38 +00:00
TreeHugger Robot
101dc265a8 Merge "Bug fix: use legacy SkCanvas regardless of color space tag" into oc-dev 2017-04-14 18:21:46 +00:00
Tsukasa Hashimoto
4ae323995d Merge "Add PID info into ANR crash log header" am: 2fe972c822 am: 5d57502c89
am: 5dbe26f0f1

Change-Id: I692162bdee8a93d49cd41967939aaab9f4c33224
2017-04-14 18:19:22 +00:00
Tsukasa Hashimoto
5dbe26f0f1 Merge "Add PID info into ANR crash log header" am: 2fe972c822
am: 5d57502c89

Change-Id: I5fc92088c55fed713716ea516a3b22e7cf00fcb0
2017-04-14 18:13:50 +00:00
Vikas Marwaha
358ec57382 Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev
am: e768104f9b

Change-Id: Ica12fabb8ab667da444cb70a54dafa26225a1458
2017-04-14 18:13:49 +00:00
Roozbeh Pournader
3f01530a68 Support overriding display locale for SuggestedLocaleAdapter
The method now accepts a locale for overriding the labels
"Suggested", "All regions", etc.

Fixes: 31257462
Test: Manual
Change-Id: I6e8c95d8d3e7b05a284b171f2cf2819d32e53d8d
2017-04-14 11:13:27 -07:00
Tsukasa Hashimoto
5d57502c89 Merge "Add PID info into ANR crash log header"
am: 2fe972c822

Change-Id: Ib7ec151a3a4b1759022a9a663836a73087ea85ec
2017-04-14 18:09:56 +00:00
Vikas Marwaha
e768104f9b Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev 2017-04-14 18:06:24 +00:00
Treehugger Robot
2fe972c822 Merge "Add PID info into ANR crash log header" 2017-04-14 18:03:12 +00:00
Wale Ogunwale
7654775b8a Merge "Move stack to front in-sync with task reparenting" into oc-dev
am: c4555784be

Change-Id: Ia9ea6523bb84c8ca4fbdd02da888a3ffef8dc543
2017-04-14 17:41:52 +00:00
Svet Ganov
651a974dd1 Fix NPE in autofill
am: 833c68e9fd

Change-Id: Iabfff7d35836149e3b823ff7bb05fdaf555c0ea4
2017-04-14 17:40:40 +00:00
Wale Ogunwale
c4555784be Merge "Move stack to front in-sync with task reparenting" into oc-dev 2017-04-14 17:33:03 +00:00
Svet Ganov
833c68e9fd Fix NPE in autofill
Test: manual

bug:37330744

Change-Id: I110ece0b9283adb9998f8df795e2107da772482e
2017-04-14 17:29:51 +00:00
Daniel Nishi
33f74edaa4 Merge "Revert "Use the StorageStatsManager in FileCollector."" into oc-dev
am: 864d53d6fc

Change-Id: I21cf2b0a245cfeaf0c788b3c869b441776ec5d0c
2017-04-14 17:18:40 +00:00
Romain Guy
95648b8a59 Add BitmapFactory.Options.inColorSpace
This allows applications to load bitmap in a preferred
target color space, similar to inPreferredConfig for
configurations.

This change also applies recent changes made to BitmapFactory
to BitmapRegionDecoder: support for outColorSpace, inColorSpace
and outConfig.

Bug: 32984164, 36905374
Test: CtsGraphicsTestCase (BitmapColorSpaceTest/BitmapRegionDecoderTest)
Change-Id: I4eded9190d1aa9c7f3033f9bb78a6854cc48a3ef
2017-04-14 10:14:27 -07:00
Dongwon Kang
294176e988 Merge "TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms" into oc-dev
am: 0cdc7c8874

Change-Id: I6d6f9739809aa04ae4f9a23a7d401df990226ded
2017-04-14 17:13:49 +00:00
Daniel Nishi
864d53d6fc Merge "Revert "Use the StorageStatsManager in FileCollector."" into oc-dev 2017-04-14 17:11:30 +00:00
Julia Reynolds
4401196798 Synchronize access to ranking helper records.
Fixes: 36282438
Test: fix is mostly hypothetical. did try clearing data
on a lot of apps while a backup was in process.

Change-Id: I58977a972d187bce2c013d55a95298b23bc0eda8
2017-04-14 17:06:03 +00:00
Dongwon Kang
0cdc7c8874 Merge "TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms" into oc-dev 2017-04-14 17:05:31 +00:00
Alan Viverette
efc602c307 Merge "Remove unnecessary casts on calls to findViewById" into oc-dev
am: 7c8ab2651b

Change-Id: I82826b63a3d6bc527c696158bfab98fe438f9847
2017-04-14 17:04:19 +00:00
Julia Reynolds
00314d97e9 Lock access to managed services.
Fixes: 35873807
Test: manual, set a notification to enqueue once a second for a few
minutes while also repeatedly granting and denying notification listener
access to a couple of apps in Settings and verifying
that nothing crashes and log is clean.

Change-Id: I15f429d61bf5f9ad639e524a94288a6d2db2cb56
2017-04-14 12:59:47 -04:00
TreeHugger Robot
7c8ab2651b Merge "Remove unnecessary casts on calls to findViewById" into oc-dev 2017-04-14 16:56:28 +00:00
Makoto Onuki
d7e405851f Fix the wrong IMPORTANCE_ values.
Bug: 36697597
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsAppTestCases -t android.app.cts.AlertWindowsTests

Change-Id: I3327d4668470400e8b30faeebb77534eeb2583ed
2017-04-14 09:47:54 -07:00
Wale Ogunwale
2719cc134e Move stack to front in-sync with task reparenting
When reparenting a task to another stack have window manager move the
destination stack to the front at the same time it is reparenting the
task if REPARENT_MOVE_STACK_TO_FRONT is set to avoid jank.

Test: manual
Bug: 37299899
Change-Id: I45678e742188a4871f93a11178f7ab2b60c7bcc3
2017-04-14 09:45:27 -07:00
Alan Viverette
2de6b0dab0 Merge "Update more implementations of findViewById()" into oc-dev
am: b7f0db8d89

Change-Id: Iaa7a100c54305623e908ec325575d936ecbaf26a
2017-04-14 16:33:14 +00:00
Matt Sarett
ca9b703b88 Bug fix: use legacy SkCanvas regardless of color space tag
Test: Added unit test. CtsGraphicsModule.

Bug: 32984164

Change-Id: If72e1e31c98e01f97f3a05d763f5d4c71cf88313
2017-04-14 16:26:50 +00:00
TreeHugger Robot
b7f0db8d89 Merge "Update more implementations of findViewById()" into oc-dev 2017-04-14 16:26:27 +00:00
Chad Brubaker
4ad2d2b4d0 Merge "Implicitly expose SEND intents to Instant Apps" into oc-dev
am: 8ee12087e6

Change-Id: I3f02d7e1b8dfba220fca62cea406650ed7851570
2017-04-14 16:14:24 +00:00
Chad Brubaker
8ee12087e6 Merge "Implicitly expose SEND intents to Instant Apps" into oc-dev 2017-04-14 16:07:15 +00:00
Hugo Benichi
9b7453f3c6 Merge "ConnectivityManager: release all requests mapping to a callback." am: 1a8f04b1b2 am: 4d80366762
am: e505b37ec5

Change-Id: I99267e14ab04ce62c5c2385f24f5865e791a24a0
2017-04-14 15:36:10 +00:00
Hugo Benichi
e505b37ec5 Merge "ConnectivityManager: release all requests mapping to a callback." am: 1a8f04b1b2
am: 4d80366762

Change-Id: I8c5d3fba8aaa19e8ffd1146ddb68c4279140f921
2017-04-14 15:29:09 +00:00
Seigo Nonaka
83c52e0a40 Merge "Use provided style for fallback font selection" into oc-dev
am: 43112fd26e

Change-Id: I15c19e1f5ff7919895af967f3ebf2d9564e0ce89
2017-04-14 15:24:10 +00:00
Hugo Benichi
4d80366762 Merge "ConnectivityManager: release all requests mapping to a callback."
am: 1a8f04b1b2

Change-Id: I30d3790822430d250d6005cc165e7fa10f56649e
2017-04-14 15:22:39 +00:00
Alan Viverette
51efddbd3b Remove unnecessary casts on calls to findViewById
Just frameworks/ this time. More paths to come.

Bug: 24137209
Test: make -j32
Change-Id: Iff27abd26fa43296ac2fff8f534fc6742d2ae80c
2017-04-14 11:15:50 -04:00
Seigo Nonaka
43112fd26e Merge "Use provided style for fallback font selection" into oc-dev 2017-04-14 15:13:15 +00:00
Treehugger Robot
1a8f04b1b2 Merge "ConnectivityManager: release all requests mapping to a callback." 2017-04-14 15:10:10 +00:00
Hugo Benichi
dafed3d008 ConnectivityManager: release all requests mapping to a callback.
This patch changes how callback unregistration works in order to be
consistent with undocumented use cases currently de-facto supported
by the API (although in a buggy way):
  - callback recycling: releasing then reregistering a callback again.
  - multiple request registrations with the same callback.

The second use case is not desirable but needs to be taken into account
for now for the purpose of correctly releasing NetworkRequests
registered in ConnectivityService.

In order to support request release in both use cases with minimal
amount of complexity for the time being the following changes are done:
  - request to callback unmapping is done synchronously at callback
    release time.
  - all requests associated to a callback are unmapped at callback
    release time.

This fixes the following issues:
  - a callback stops being triggered as soon as it is released.
    Otherwise when recycling the callback immediately, it is possible
    the previous request associated with it triggers it, confusing the
    app.
  - when a callback is registered multiple times, the requests are not
    leaked.
  - when a callback is registered multiple times and then released, the
    N-1 first registrations do not trigger the callback anymore.

In the future it would be desirable to enforce the intended 1:1 mapping
between callbacks and requests at registration time.

Bug: 35921499, 35955593, 20701525
Test: - added new tests in ConnectivityManagerTest to test releasing,
      recycling, and a disabled test for no multiple regristration.
      - new tests catch regression causing b/35921499, b/35955593.
Change-Id: Ia0917ac322fc049f76adb4743bc745989fed6d26
2017-04-14 22:17:21 +09:00
Hugo Benichi
af18992066 Merge "Captive portal: rotate fallback urls" into oc-dev
am: a622b24d3a  -s ours

Change-Id: I60f1cca6bb834f8f82dd0627c0943f5785a79122
2017-04-14 12:34:33 +00:00
Hugo Benichi
a622b24d3a Merge "Captive portal: rotate fallback urls" into oc-dev 2017-04-14 12:28:42 +00:00
Jorim Jaggi
27af670d9a Merge "Implement new splash screen API" into oc-dev
am: 46ae660bf2

Change-Id: I2f12289fcf82754a46365d0342997ae7bf59a2f8
2017-04-14 12:02:08 +00:00
TreeHugger Robot
46ae660bf2 Merge "Implement new splash screen API" into oc-dev 2017-04-14 11:54:47 +00:00
Andrew Scull
d4be031c76 Merge "Service for OEM lock management." into oc-dev
am: e52a1bfede

Change-Id: I074e29147417d6a358fd97e7e60cd4cfbed5c4df
2017-04-14 11:43:03 +00:00
Andrew Scull
e52a1bfede Merge "Service for OEM lock management." into oc-dev 2017-04-14 11:31:06 +00:00