232275 Commits

Author SHA1 Message Date
Geoff Mendal
5f346b6123 Import translations. DO NOT MERGE
Change-Id: I2fd0cda2b14b49646e59253e874cef28e84a5c2f
Auto-generated-cl: translation import
2016-02-08 22:16:31 +05:30
Julia Reynolds
ae0f0da91b Merge "Update DND visual interruption choices." into nyc-dev 2016-02-08 16:10:23 +00:00
Geoff Mendal
d65d343481 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-02-08 15:54:22 +00:00
Geoff Mendal
4f4b41911d Import translations. DO NOT MERGE
Change-Id: Ibace3035d3275c1fdbb39cd3769844dfaef35d00
Auto-generated-cl: translation import
2016-02-08 10:52:49 -05:00
Julia Reynolds
d560729ce3 Update DND visual interruption choices.
Change-Id: I7050264839c566dcef1dd01d155dda694a8d1ec0
2016-02-08 15:20:02 +00:00
Jason Monk
c3f42c1024 Add support for auto-adding tiles
hotspot, color inversion, data saver, and work profiles should add
themselves when they first become applicable.

Also refactor the availability flow a little bit.

Change-Id: Iaed89059540a98fefd4d26ce69edc0dde987b992
2016-02-08 15:17:11 +00:00
Jason Monk
cafda1f90e Settings drawer work
- Final visuals
 - Show under status bar
 - Fix activity flow surrounding drawer use

Change-Id: I161702219c26cabc6b2d1adbaa6fbfb1d9fd5b07
2016-02-08 15:12:25 +00:00
Nicolas Prévot
e64f3da729 Merge "Fail if setProfileEnabled is called outside a managed profile." into nyc-dev 2016-02-08 14:08:20 +00:00
Nicolas Prevot
e28e5a9d3b Fail if setProfileEnabled is called outside a managed profile.
BUG:26709495
Change-Id: I98adf2dab1e7b27fef926144c460af8823fe96e7
2016-02-08 14:03:39 +00:00
Paul Jensen
0ab80e6c26 Fix FrameworksServicesTests.apk to include libc++.so
am: 5f3dec374f

* commit '5f3dec374fac97365ec95ec407a1cffc2c3907c9':
  Fix FrameworksServicesTests.apk to include libc++.so
2016-02-08 11:41:25 +00:00
Paul Jensen
5f3dec374f Fix FrameworksServicesTests.apk to include libc++.so
libc++.so is no longer accessible to the app, so it must be
bundled in the app. This should get ApfTest passing again.

Change-Id: Ide004cb84f7f50feffb8f5acb46b7001dcffd208
2016-02-07 21:58:09 -05:00
Jeff Sharkey
b7289330e1 Another intent sent by both system and apps.
Bug: 26219772
Change-Id: I4e52c6836e65b983800ef59ad7a1ade5b3a2bea2
2016-02-07 13:08:02 -07:00
Jeff Sharkey
f4aa33c97c Merge "Migrate default app data on non-FBE devices." 2016-02-07 03:57:32 +00:00
Jeff Sharkey
e4697136ed Migrate default app data on non-FBE devices.
When a system app requests "forceDeviceEncrypted" they expect their
default app storage to point at a consistent location regardless of
device FBE support.  So when booting upgraded non-FBE devices, we
may need to migrate any data from CE to DE.  Note that on non-FBE
devices these are just semantic locations with identical protection.

This migration *only* works for non-FBE devices; changing
forceDeviceEncrypted flags on an FBE device always requires a full
data wipe.

Bug: 26668510
Change-Id: Ic5dfeaaf2db26c385901a638ca8ec35eb3c52859
2016-02-06 20:45:15 -07:00
Ritesh Reddy
c170204541 Merge "UsageStatsBackup Bug Fix" 2016-02-06 19:42:14 +00:00
Tamas Berghammer
25222f55f2 Merge "Add flag to "am start" to enable native debugging" 2016-02-06 13:18:58 +00:00
Paul Crowley
dccc4a834d Merge "Always get an auth token when we verify." 2016-02-06 08:43:28 +00:00
Chris Craik
62cd9e4a72 Fix build
Change-Id: I1ad30ae50cbdff9267d0121a446e6adbe3ad17ee
2016-02-05 18:17:35 -08:00
Jan Nordqvist
6913d30f1c Merge "Hotspot 2.0 release 2 client app." 2016-02-06 01:40:13 +00:00
Chris Craik
807842acfa Merge "Move several property queries to Properties class" 2016-02-06 01:39:34 +00:00
Chris Craik
48a8f431fa Move several property queries to Properties class
bug:17478770

This removes a lot of redundant property query code, and puts the
queries all in one place, so defining them automatically will be simpler
in the future.

Change-Id: I0428550e6081f07bc6554ffdf73b22284325abb8
2016-02-05 17:38:22 -08:00
Jan Nordqvist
ee699a61a5 Hotspot 2.0 release 2 client app.
Change-Id: Ic8f93a3c9fede3f25c03b0153826ac5c49771b60
2016-02-05 17:35:09 -08:00
Adam Lesinski
2068bb8bb0 Merge "Track BLE scans in BatteryStats" 2016-02-06 00:52:38 +00:00
Jeff Sharkey
ea2a9ee0b6 Merge "Use the right ClassLoader when restoring." 2016-02-06 00:15:41 +00:00
Jeff Sharkey
ba9a4b397f Use the right ClassLoader when restoring.
If we're restoring after a background process death, the Parcelable
creator cache is cold, and since we're handing in a null ClassLoader
the best the platform can do is try the default ClassLoader which
knows nothing about the running app.

That's why ClassLoaderCreator exists, so use it to snag the relevant
ClassLoader and pass it along.

Bug: 26075620
Change-Id: I6fd977d6178dd0f5f9c465597f5806a08097ac7c
2016-02-05 17:13:21 -07:00
John Reck
d1ddcf19bb resolve merge conflicts of 9ea5295597 to master.
Change-Id: I68b883e8a1bb17abd4cf151d057dd07e53a80f50
2016-02-05 15:59:55 -08:00
John Reck
9ea5295597 Merge "libhwui: handle eglSwapBuffers with EGL_BAD_NATIVE_WINDOW error case"
am: 857b65657d

* commit '857b65657d453801e9b73f998043603456dac813':
  libhwui: handle eglSwapBuffers with EGL_BAD_NATIVE_WINDOW error case
2016-02-05 23:52:12 +00:00
John Reck
857b65657d Merge "libhwui: handle eglSwapBuffers with EGL_BAD_NATIVE_WINDOW error case" 2016-02-05 23:38:10 +00:00
Chong Zhang
af78708e98 Merge "Check wallpaper visibility to determine if wallpaper is obscuring apps." 2016-02-05 23:32:56 +00:00
Jeff Sharkey
bb17d092fd Merge "Tweaks to file:// Uri StrictMode checks." 2016-02-05 23:21:30 +00:00
Jeff Sharkey
37355a9f5d Tweaks to file:// Uri StrictMode checks.
Whitelist two more legacy intent actions, and don't enforce the
StrictMode checks when resolving intents that might be coming from
legacy apps.  Newer apps would have already been yelled at directly
before getting to the resolver.

Bug: 26976516, 26977622
Change-Id: Ibf72a361ed68c52cfaac16c32ab40e79005a42e7
2016-02-05 16:19:13 -07:00
Abhijith Shastry
8c3b70bb8c Merge "Carrier config to support overriding block suppress duration after emergency contact." 2016-02-05 23:08:28 +00:00
Abhijith Shastry
d48935879a Carrier config to support overriding block suppress duration after emergency contact.
BUG: 26989170
Change-Id: I6d8f13dd4f2b69730826cc8440a22c7154255ac8
2016-02-05 15:06:56 -08:00
Chong Zhang
66bf071d11 Check wallpaper visibility to determine if wallpaper is obscuring apps.
bug: 26948569
Change-Id: I710893ee086dce441cb5e2744fc721d3e1a2fd8a
2016-02-05 14:42:36 -08:00
Alex Klyubin
bd0d4265bb Merge "Fix typo in KeyInfo Javadoc." am: e8fbc20e12
am: b21416e287

* commit 'b21416e2875973706d8b922428225194d9625875':
  Fix typo in KeyInfo Javadoc.
2016-02-05 22:37:31 +00:00
Alex Klyubin
b21416e287 Merge "Fix typo in KeyInfo Javadoc."
am: e8fbc20e12

* commit 'e8fbc20e12da685acddffc01c41ccf134f051ce9':
  Fix typo in KeyInfo Javadoc.
2016-02-05 22:33:09 +00:00
Jean-Michel Trivi
e35bde5291 Merge "Dynamic audio policies: fix AttributeMatchCriterion addition in mix" 2016-02-05 22:27:26 +00:00
Alex Klyubin
e8fbc20e12 Merge "Fix typo in KeyInfo Javadoc." 2016-02-05 22:26:56 +00:00
Steven Dao
6ce4a46a96 Merge "Fix GridView isHeading computation" 2016-02-05 22:23:54 +00:00
Tyler Gunn
65b266d956 Merge "IMS: Constants For Audio Quality, Supp. Services" into mm-wireless-dev
am: 6c4aac0bde

* commit '6c4aac0bdee2678818f577490c4acfdeeba81c59':
  IMS: Constants For Audio Quality, Supp. Services
2016-02-05 22:18:26 +00:00
Alex Klyubin
d9dded5a46 Fix typo in KeyInfo Javadoc.
Change-Id: I801005a93aee71b93b3d6cf3f7c38361493ff203
2016-02-05 14:18:19 -08:00
Tyler Gunn
6c4aac0bde Merge "IMS: Constants For Audio Quality, Supp. Services" into mm-wireless-dev 2016-02-05 22:13:32 +00:00
Steven Dao
061b16ff88 Fix GridView isHeading computation
- Same issue that was previously in the ListView

Change-Id: I3a3105b46bdadc43ea679b4d29d0719a67c291bc
2016-02-05 13:51:55 -08:00
Christian Poetzsch
9a878a646f hwui: set buffer destroyed swap mode explicitly
Not using EGL_SWAP_BEHAVIOR_PRESERVED_BIT as config attribute for
eglChooseConfig doesn't automatically mean the swap behavior is buffer
destroyed. This is driver implementation specific and on some hw this
can still be buffer preserved. Make sure it is buffer destroyed by
explicitly setting it for every new surface when requested.

Change-Id: Ie2c7c89b0d20e35832b488c6263bb4d9dd844a75
Signed-off-by: Christian Poetzsch <christian.potzsch@imgtec.com>
2016-02-05 13:51:37 -08:00
John Reck
0b69467d42 Merge "Add a debug assert to track down infinite loop" 2016-02-05 21:40:16 +00:00
Doris Liu
469a828ac7 Merge "Ref count the nodes in VectorDrawable" 2016-02-05 21:31:24 +00:00
Doris Liu
43a5591c8d Merge "Revert "Revert "VectorDrawable native rendering - Step 4 of MANY""" 2016-02-05 21:31:06 +00:00
Makoto Onuki
bb66a0edfe Merge "Prevent NPE in ContactsContract" 2016-02-05 21:30:39 +00:00
Makoto Onuki
da072b3e38 Prevent NPE in ContactsContract
Bug 26730982

Change-Id: I36fdfffba79e0696175edd42bb131f92cba47499
2016-02-05 13:28:45 -08:00
Peng Xu
2a2ec8640e Merge "Fix potential crash when getSensorList returns error" 2016-02-05 21:07:23 +00:00