308644 Commits

Author SHA1 Message Date
TreeHugger Robot
0c6d24f736 Merge "Log rendering pipeline when initializing" 2017-02-24 01:28:17 +00:00
TreeHugger Robot
9584868f88 Merge "Add new internal resolve method" 2017-02-24 01:22:52 +00:00
TreeHugger Robot
bdecfe1445 Merge "Load hyphenation patterns for Bulgarian and Church Slavonic" 2017-02-24 01:14:01 +00:00
Scott Main
71abcbb106 Merge "Add API 'since' tag for O dev preview (current.txt)" 2017-02-24 01:04:40 +00:00
TreeHugger Robot
5ac42e771d Merge "Allow system configs to be read from vendor partition" 2017-02-24 01:02:23 +00:00
TreeHugger Robot
8a362bb9a5 Merge "Fix mStringBlocks race in the AssetManager" 2017-02-24 00:42:02 +00:00
Andre Eisenbach
824498943a Merge "resolve merge conflicts of cbca6aa2f1df to master" 2017-02-24 00:37:49 +00:00
Jaewan Kim
5faf303931 Merge "PIP: Use resource to maintain settings class list to shift PIP to left" 2017-02-24 00:29:03 +00:00
TreeHugger Robot
bd9e74cae0 Merge "OMS: integrate OverlayManagerService into framework" 2017-02-24 00:07:42 +00:00
Dimitry Ivanov
f16213a656 resolve merge conflicts of cbca6aa2f1df to master
Change-Id: I085e97b8281ca64fd73b23effdd9b1c5aa9afb06
2017-02-23 15:53:38 -08:00
Chris Craik
6e66b39e4a Log rendering pipeline when initializing
Test: manual, boots

Change-Id: I6e544510053ecf2b397ac998bcc7be9c00295a7d
2017-02-23 15:51:59 -08:00
Todd Kennedy
4d1de7da79 Add new internal resolve method
Instant apps are unique in that any application can start them
with a VIEW/BROWSABLE while only very few apps can see an
instant app using queryIntentActivites, etc... In order to
support this dichotomy, we need an internal hook to resolution
for activity start.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Bug: 25119046
Change-Id: If6974c09c733ff0417ef72cabb9d9e9aca86c37c
2017-02-23 15:38:55 -08:00
Dimitry Ivanov
cbca6aa2f1 Merge "Add isBundled argument to LoadedApk.makePaths call" am: 0743d56e2b
am: 029170ee2b

Change-Id: Ia566854612ea9c9570fb8d7b6adc1a0e1e074d02
2017-02-23 23:36:40 +00:00
Dimitry Ivanov
029170ee2b Merge "Add isBundled argument to LoadedApk.makePaths call"
am: 0743d56e2b

Change-Id: I74deae8126109555bbbe57983ffd6a22ab50e303
2017-02-23 23:30:16 +00:00
Treehugger Robot
0743d56e2b Merge "Add isBundled argument to LoadedApk.makePaths call" 2017-02-23 23:21:10 +00:00
Jiaquan He
339dc75d46 Merge "Fix ColorStateList bug." 2017-02-23 23:14:00 +00:00
TreeHugger Robot
1b0f1568d9 Merge "Auto-fill logging improvements:" 2017-02-23 23:01:33 +00:00
Scott Main
05b9926a2c Add API 'since' tag for O dev preview (current.txt)
Change-Id: I10ffd161f9249794df7d263a11703fbca0d88451
2017-02-23 14:51:06 -08:00
Johan Redestig
22723ffaba Fix mStringBlocks race in the AssetManager
There were a few places where access to the mStringBlocks were
not protected.

The crashes seen where similar to:

  java.lang.NullPointerException: Attempt to invoke virtual method \
    'java.lang.CharSequence android.content.res.StringBlock.get(int)' on a null object reference
  at android.content.res.AssetManager.getResourceValue(AssetManager.java:222)
  at android.content.res.ResourcesImpl.getValue(ResourcesImpl.java:188)
  at android.content.res.Resources.loadXmlResourceParser(Resources.java:2110)
  at android.content.res.Resources.getLayout(Resources.java:1111)

  java.lang.NullPointerException: Attempt to invoke virtual method \
    'java.lang.CharSequence android.content.res.StringBlock.get(int)' on a null object reference
  at android.content.res.AssetManager.getPooledStringForCookie(AssetManager.java:312)
  at android.content.res.TypedArray.loadStringValueAt(TypedArray.java:1212)
  at android.content.res.TypedArray.getValueAt(TypedArray.java:1198)
  at android.content.res.TypedArray.getColor(TypedArray.java:446)

What happened was that thread 1 was creating a new mStringBlocks in
makeStringBlocks while thread 2 was accessing mStringBlocks. The
makeStringBlocks starts off by overwriting mStringBlocks with a new
empty array and when thread 2 accessed its content NPE happened.

Bug: 30802713
Test: None (just added synchronization to help prevent races)
Change-Id: I810da26b161a6528b0dd241048dde5b239089244
2017-02-23 14:46:05 -08:00
Scott Main
13a80432a6 Merge "switch all droiddoc builds to use templates-sdk from doclava" 2017-02-23 22:42:10 +00:00
Chong Zhang
15d10517cf Merge "MediaCas: add framework APIs" 2017-02-23 22:36:22 +00:00
Abhishek Adappa
423b3bd84f Merge "Add a new ImsReasonInfo code" am: b4234e6af8 am: bb59947d90
am: 44f4430953

Change-Id: Iaaa2f91f36f0f57a81a5f0e7781564296654a33a
2017-02-23 22:32:50 +00:00
Abhishek Adappa
44f4430953 Merge "Add a new ImsReasonInfo code" am: b4234e6af8
am: bb59947d90

Change-Id: I06bd38225b0fcbd8619a5b5eb7d827cfba1c0cb0
2017-02-23 22:27:07 +00:00
Abhishek Adappa
bb59947d90 Merge "Add a new ImsReasonInfo code"
am: b4234e6af8

Change-Id: Ia5174fafbc08acf559e35a28538d2b112b5cdb19
2017-02-23 22:22:40 +00:00
Dimitry Ivanov
484fbe9273 Add isBundled argument to LoadedApk.makePaths call
There is a disconnect between the way webview created
classloader and the way makePaths decides if paths are
intended for bundled app.

This change moves decision making out of makePaths method
which allows WebViewZygote to pass correct argument and
have makePath omit java.library.path for libPaths

Bug: http://b/35426785
Test: manual
Change-Id: Iab5a18c0091d0193dafa750498eb00f378411ba0
(cherry picked from commit 638d81009918eae44eec3261e235b78eae44331d)
2017-02-23 14:16:45 -08:00
Treehugger Robot
b4234e6af8 Merge "Add a new ImsReasonInfo code" 2017-02-23 22:14:21 +00:00
Mårten Kongstad
2e0d0f3111 OMS: integrate OverlayManagerService into framework
Hand over ownership of overlays to OverlayManagerService.

Changes to a package's overlays are propagated using the activity life
cycle. Affected activities will be recreated as needed. This provides a
well-defined point to modify an application's assets while the
application is paused.

Consolidate how overlays targeting the system and overlays targeting
regular applications are handled. Previously, system overlays were
handled as a special case. Now, everything is handled identically. As a
side effect, the call to idmap --scan during Zygote boot has become
obsolete and is removed.

Information on what overlays to use is recorded in
ApplicationInfo.resourceDirs. The PackageManagerService is responsible
for the creation of ApplicationInfo objects. The OverlayManagerService
is responsible for informing the PackageManagerService in advance about
what resourceDirs to use.

When launching an application, the ApplicationInfo is already populated
with up-to-date information about overlays.

When enabling or disabling an overlay for a running application, the
OverlayManagerService first notifies the PackageManagerService about the
updated resourceDirs. It then tells the ActivityManagerService to push
the new ApplicationInfo object to the application's ActivityThread.
Finally the application requests its ResourcesManager to create new
ResourcesImpl objects based on the updated paths.

Change-Id: Ib8afa05ccab4e2db558f89ce4423983c086bb61a
Co-authored-by: Martin Wallgren <martin.wallgren@sonymobile.com>
Signed-off-by: Zoran Jovanovic <zoran.jovanovic@sonymobile.com>
Bug: 31052947
Test: run tests from 'OMS: tests for OverlayManagerService'
2017-02-23 14:01:38 -08:00
Rebecca Silberstein
e71d9469a3 Merge "wifi.proto: add SoftApReturnCode enum" am: 84374678e0 am: e1dd7de75e
am: ded006f4cf

Change-Id: I8c41e4aff5734db561d2e63a7df344e292179832
2017-02-23 21:57:09 +00:00
Rebecca Silberstein
ded006f4cf Merge "wifi.proto: add SoftApReturnCode enum" am: 84374678e0
am: e1dd7de75e

Change-Id: I9d3b69543b45dbf797d5fee0f8de51966ca4dacb
2017-02-23 21:52:34 +00:00
Rebecca Silberstein
e1dd7de75e Merge "wifi.proto: add SoftApReturnCode enum"
am: 84374678e0

Change-Id: I22d8aca86a5a5c28c393db372b4399e5ddd99f46
2017-02-23 21:46:51 +00:00
Rebecca Silberstein
84374678e0 Merge "wifi.proto: add SoftApReturnCode enum" 2017-02-23 21:29:02 +00:00
Scott Main
15b8517424 switch all droiddoc builds to use templates-sdk from doclava
Change-Id: I9007f4d49a3076e8b38a2c97e936cf6d6710e87a
2017-02-23 21:27:13 +00:00
TreeHugger Robot
5feacbed43 Merge "Load splits on-demand" 2017-02-23 21:25:08 +00:00
TreeHugger Robot
d7ece194c7 Merge "Fix unit test that failed due to incorrect refactor." 2017-02-23 21:24:39 +00:00
TreeHugger Robot
ff14143cee Merge "Take another pass at detecting USB connections." 2017-02-23 21:11:54 +00:00
TreeHugger Robot
23830a0909 Merge "Remove ContentProvider queries in updateTileData." 2017-02-23 21:11:18 +00:00
Svetoslav Ganov
28a7194d25 Merge "Ensure default and system set bits grandfathered" 2017-02-23 21:03:44 +00:00
TreeHugger Robot
2930f49464 Merge "Revert "Remove abstract from AccessibilityService methods"" 2017-02-23 21:03:33 +00:00
Jaekyun Seok
e3b6bf175c Allow system configs to be read from vendor partition
Soc vendors also want to add their own configs like odms do.
Additionally they should be allowed to add their own app permission
configs because they can install their own apps in /vendor/app.
So Soc vendors should be able to add system configs around libs,
features, permissions and apps.

Additionally this CL modified codes to allow "privapp-permissions"
only on system partition because we won't allow apps on the partner
partitions to count as privileged.

Test: building succeeded and tested on sailfish.
Bug: 35369237
Change-Id: I7d84d6e351d9e7023931757082d9f661c5a9a80a
2017-02-24 06:02:02 +09:00
Svet Ganov
137015599e Ensure default and system set bits grandfathered
We added the notion of a default and whether the system set
the setting. This is used for resetting the internal state and we need
to make sure this value is updated for the existing settings, otherwise
we would delete system set settings while they should stay unmodified.

Test: manual

bug:35317326

Change-Id: Iaffde2e7acab53653fd38e669a644e654cc7cd7d
2017-02-23 12:58:13 -08:00
Paul Lawrence
1d23472101 Merge "Use bionic's autogenerated whitelist policy" am: dcd14de5f6 am: 82c92f94bf
am: d82ce88b6c

Change-Id: Iba0e83f72931509331bd48fe85597c10ceec240e
2017-02-23 20:56:36 +00:00
TreeHugger Robot
212b51422d Merge "PlayerBase: reference to IAppOpsService may be null" 2017-02-23 20:54:06 +00:00
Amin Shaikh
08a1f24dd7 Merge changes from topic 'disabled-reason' am: d0fc3f1383 am: b858ffbe42
am: a071d9693b

Change-Id: I1ebe58cc4c7162931ad8679f87ade288489d4e8b
2017-02-23 20:47:46 +00:00
Paul Lawrence
d82ce88b6c Merge "Use bionic's autogenerated whitelist policy" am: dcd14de5f6
am: 82c92f94bf

Change-Id: I2995ab46372e10db9f879c359ead1ccbef9b45ae
2017-02-23 20:46:41 +00:00
Amin Shaikh
df0deba144 Add a disabled reason for recommendation providers am: a70bc57ef9 am: df6f7b9388
am: 004a682135

Change-Id: I02a7adb0d31bef2efdda0a4bcf7168d41674b559
2017-02-23 20:46:28 +00:00
TreeHugger Robot
52ab46519c Merge "Add metrics constant for Settings->Security->Encryption & credentials." 2017-02-23 20:41:44 +00:00
Paul Lawrence
82c92f94bf Merge "Use bionic's autogenerated whitelist policy"
am: dcd14de5f6

Change-Id: Idf1ab0f6a2028a1e41c52f6269ec05a9f1e87ec5
2017-02-23 20:41:33 +00:00
Amin Shaikh
a071d9693b Merge changes from topic 'disabled-reason' am: d0fc3f1383
am: b858ffbe42

Change-Id: I5138cd1713ccecac8fa304275aec88734c040ffb
2017-02-23 20:41:12 +00:00
Amin Shaikh
004a682135 Add a disabled reason for recommendation providers am: a70bc57ef9
am: df6f7b9388

Change-Id: Id69eccbba15a0eb20c48680204007ed5354bd734
2017-02-23 20:39:57 +00:00
Amin Shaikh
b858ffbe42 Merge changes from topic 'disabled-reason'
am: d0fc3f1383

Change-Id: I09e7dff673a56fb3c51cde827ae783da32407a70
2017-02-23 20:35:10 +00:00