Commit Graph

232284 Commits

Author SHA1 Message Date
Ben Kwa
032c283ef3 Update the subdir icon to svg.
BUG=21705832

Change-Id: I400b5402c0efd34d79be3e8b05b2154dd8c48735
2016-02-08 09:40:08 -08:00
Nicolas Prévot
eccbe69a55 Merge "Fail if setProfileEnabled is called outside a managed profile." into nyc-dev
am: e64f3da729

* commit 'e64f3da729ae6a00fb627f00b8a97e7c5feb8bcb':
  Fail if setProfileEnabled is called outside a managed profile.
2016-02-08 14:14:06 +00:00
Geoff Mendal
d4da61ec84 Merge "Import translations. DO NOT MERGE" 2016-02-08 14:09:40 +00:00
Geoff Mendal
f1a48c4f65 Import translations. DO NOT MERGE
Change-Id: I9f200f62afe25de339959f5f9d1d2b437913b7c7
Auto-generated-cl: translation import
2016-02-08 06:08:49 -08: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
Geoff Mendal
3a29c515d9 Merge "Import translations. DO NOT MERGE" 2016-02-08 13:50:26 +00:00
Geoff Mendal
646ad30175 Import translations. DO NOT MERGE
Change-Id: Ibc727a45265f08ab375ed60244a1af4944e530ba
Auto-generated-cl: translation import
2016-02-08 05:46:18 -08:00
Geoff Mendal
5295335f22 Merge "Import translations. DO NOT MERGE" 2016-02-08 13:34:27 +00:00
Geoff Mendal
1cb98e034e Import translations. DO NOT MERGE
Change-Id: Iaad7778f1ee0bd39cf24556b75bbae4af63886df
Auto-generated-cl: translation import
2016-02-08 05:22:13 -08:00
Geoff Mendal
36d2b7a0b5 Import translations. DO NOT MERGE
Change-Id: Icbf4b93767f896313d9ed9099696a013f8ffc369
Auto-generated-cl: translation import
2016-02-08 05:09:47 -08:00
Paul Jensen
4e3bdd3ba0 Fix FrameworksServicesTests.apk to include libc++.so am: 5f3dec374f
am: 0ab80e6c26

* commit '0ab80e6c261339d17585522a6b69d98a16779c0b':
  Fix FrameworksServicesTests.apk to include libc++.so
2016-02-08 11:49:55 +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
Seigo Nonaka
dfe3d6100d Merge "Introduce dimension of text edit related floating window." 2016-02-08 11:39:15 +00:00
Seigo Nonaka
eee8941e52 Introduce dimension of text edit related floating window.
This is a follow up CL of I5a9bcbe29400d6193eb0532a5e711a78a12383cd.
Floating toolbar and suggestion window has a same elevation and
layout_margin. Introduce dimension value for elevation and
layout_margin and refer them.

Bug: 15347319

Change-Id: I6c635398241b60415437707285faeac76a1a4b6d
2016-02-08 11:29:44 +00:00
Tomasz Mikolajewski
5e0cf4fd31 Merge "Migrate all tests to ActivityTest." 2016-02-08 09:12:00 +00:00
Tomasz Mikolajewski
e366886c7d Migrate all tests to ActivityTest.
ActivityInstrumentationTestCase2 takes care of starting and closing
the activity, which prevents flakyness.

Change-Id: I2d3908f6605a67a3c2d11e18a9c4799443828df9
2016-02-08 14:12:26 +09: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
Daichi Hirono
c7cf0dd77e Merge "Relax mapping rule to make the mapping logic simple." 2016-02-08 02:18:29 +00: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
Daichi Hirono
acdbc6e740 Relax mapping rule to make the mapping logic simple.
MtpDocumentsProvider remembers the mapping between SAF's ID and MTP's
ID. Sometimes we need to do heuristic to restore the mapping when MTP
device is reconnected.

Previously we do the mapping files that shares the same name more
strictly. For example,

1. Found file name "test.txt". Assign document ID "1".
2. MTP device is disconnected and the MTP ID of "1" is lost.
3. Found two files that have same name "test.txt" in the same directory.

Previously we don't reuse existing document ID "1" for neither of two
"test.txt" because it's not 1-to-1 mapping and we cannot determine which
one should be mapped with existing document ID. It means we need the
complete list of files in a directory to remap IDs. It takes long time
to fetch all file names in a directory when a directory has 100+
files. It's rare that a MTP device has the two files sharing the same
name in the same directory. Also the strict rule makes the mapping code
more complex.

The CL relax the rule of mapping, and it allows to reuse existing
document ID even if it is not 1-to-1 mapping. For the previous example,
it assigns "1" for either of "test.txt".

BUG=27053734
Change-Id: I19406fafc21f13ab94ba99411ce5e7f55ce7f658
2016-02-07 13:31:01 +09: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