OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "AAPT2: Use manifest parsing to determine format of APK."
Pierre Lecesne [Fri, 1 Dec 2017 21:53:37 +0000 (21:53 +0000)]
Merge "AAPT2: Use manifest parsing to determine format of APK."

6 years agoMerge "Merge from oc-preview-docs-release: docs: Added note that INSTALL_SHORTCUT...
Kevin Hufnagle [Fri, 1 Dec 2017 21:16:57 +0000 (21:16 +0000)]
Merge "Merge from oc-preview-docs-release: docs: Added note that INSTALL_SHORTCUT is implicit broadcast as of O." into oc-dev am: a96e533840 am: 87b5b0aa1a am: 9d3563ad78
am: 22d290b289

Change-Id: I994b9e0f7ea2b585c4f8f03231ed4d4c92e7e18e

6 years agoMerge "Extreme battery saver: Show warning notification instead of toast"
Makoto Onuki [Fri, 1 Dec 2017 21:05:55 +0000 (21:05 +0000)]
Merge "Extreme battery saver: Show warning notification instead of toast"

6 years agoMerge "Merge from oc-preview-docs-release: docs: Added note that INSTALL_SHORTCUT...
Kevin Hufnagle [Fri, 1 Dec 2017 20:48:23 +0000 (20:48 +0000)]
Merge "Merge from oc-preview-docs-release: docs: Added note that INSTALL_SHORTCUT is implicit broadcast as of O." into oc-dev am: a96e533840 am: 87b5b0aa1a
am: 9d3563ad78

Change-Id: I3355b274bf2fad2190cd21f16c01e218a17c8b56

6 years agoMerge "Merge from oc-preview-docs-release: docs: Added note that INSTALL_SHORTCUT...
Kevin Hufnagle [Fri, 1 Dec 2017 20:27:49 +0000 (20:27 +0000)]
Merge "Merge from oc-preview-docs-release: docs: Added note that INSTALL_SHORTCUT is implicit broadcast as of O." into oc-dev am: a96e533840
am: 87b5b0aa1a

Change-Id: Iabdbdf3f19e5faa4a0e980afc4d643dad192fc62

6 years agoAdds soft AP timeout settings
Mehdi Alizadeh [Fri, 10 Nov 2017 23:37:13 +0000 (15:37 -0800)]
Adds soft AP timeout settings

Adds two different settings for this feature: 1) to enable/disable
the timeout mechanism (by a toggle control from Settings UI). 2) to set
the timeout duration which is configurable as an overlay.

Bug: 68712445
Test: None
Change-Id: I6232410f85b9c25477d3edada37cc7312d888f19

6 years agoMerge "Merge from oc-preview-docs-release: docs: Added note that INSTALL_SHORTCUT...
Kevin Hufnagle [Fri, 1 Dec 2017 20:20:44 +0000 (20:20 +0000)]
Merge "Merge from oc-preview-docs-release: docs: Added note that INSTALL_SHORTCUT is implicit broadcast as of O." into oc-dev
am: a96e533840

Change-Id: Iefd97a3d8b1377dd72f3a3428c539cb029b4e0a9

6 years agoMerge "Adding comments to BatteryServiceDumpProto."
TreeHugger Robot [Fri, 1 Dec 2017 20:07:51 +0000 (20:07 +0000)]
Merge "Adding comments to BatteryServiceDumpProto."

6 years agoMerge "Merge from oc-preview-docs-release: docs: Added note that INSTALL_SHORTCUT...
Kevin Hufnagle [Fri, 1 Dec 2017 20:06:38 +0000 (20:06 +0000)]
Merge "Merge from oc-preview-docs-release: docs: Added note that INSTALL_SHORTCUT is implicit broadcast as of O." into oc-dev

6 years agoMerge "docs: Fixed description of SENSORS permission group" into oc-mr1-dev am: 039d9...
Andrew Solovay [Fri, 1 Dec 2017 19:51:57 +0000 (19:51 +0000)]
Merge "docs: Fixed description of SENSORS permission group" into oc-mr1-dev am: 039d9713a8
am: 925e428f00

Change-Id: I95c539973e0011fc3251b03fd81ce040efb85a7e

6 years agoMerge "docs: Fixed description of SENSORS permission group" into oc-mr1-dev
Andrew Solovay [Fri, 1 Dec 2017 19:40:06 +0000 (19:40 +0000)]
Merge "docs: Fixed description of SENSORS permission group" into oc-mr1-dev
am: 039d9713a8

Change-Id: I6948a7b02b873d6c1af49da926d81d762ef6b82c

6 years agoMerge "docs: Add note to getFrameAtTime() pointing to getScaledFrameAtTime()" into...
Andrew Solovay [Fri, 1 Dec 2017 19:38:03 +0000 (19:38 +0000)]
Merge "docs: Add note to getFrameAtTime() pointing to getScaledFrameAtTime()" into oc-mr1-dev am: 284259a633
am: dd71b1bc61

Change-Id: Ib3f40c78449e6b4e837d053645a9cd9f3ab29ee4

6 years agoMerge "docs: Fixed description of SENSORS permission group" into oc-mr1-dev
TreeHugger Robot [Fri, 1 Dec 2017 19:30:44 +0000 (19:30 +0000)]
Merge "docs: Fixed description of SENSORS permission group" into oc-mr1-dev

6 years agoMerge "docs: Add note to getFrameAtTime() pointing to getScaledFrameAtTime()" into...
Andrew Solovay [Fri, 1 Dec 2017 19:29:13 +0000 (19:29 +0000)]
Merge "docs: Add note to getFrameAtTime() pointing to getScaledFrameAtTime()" into oc-mr1-dev
am: 284259a633

Change-Id: Ic8c9f91f1fc1e6c32bae90d8bf8fbe6b91beb712

6 years agoMerge "docs: Add note to getFrameAtTime() pointing to getScaledFrameAtTime()" into...
Andrew Solovay [Fri, 1 Dec 2017 19:19:04 +0000 (19:19 +0000)]
Merge "docs: Add note to getFrameAtTime() pointing to getScaledFrameAtTime()" into oc-mr1-dev

6 years agoMerge "Remove old BackupManagerService"
TreeHugger Robot [Fri, 1 Dec 2017 18:09:49 +0000 (18:09 +0000)]
Merge "Remove old BackupManagerService"

6 years agoMerge "Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor Test: make ds-docs...
Jon Dormody [Fri, 1 Dec 2017 16:53:12 +0000 (16:53 +0000)]
Merge "Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor Test: make ds-docs Bug: 1766768" into oc-dev am: ce7f1e6601 am: 3ba37e1f53 am: 96dad7e0a3
am: c0c7c3bcbb

Change-Id: I6d8c7f76139522fae1b506519aba4ab6f8e54d3b

6 years agoMerge "Docs: Added mention that the getSharedPreferences method is thread safe."...
Jon Dormody [Fri, 1 Dec 2017 16:42:30 +0000 (16:42 +0000)]
Merge "Docs: Added mention that the getSharedPreferences method is thread safe." into oc-dev am: fb839ce59a am: 728ca235b5 am: 37db2694eb
am: f506b49aa6

Change-Id: Ie4a7176be63ddcc8f1e4e9fad98ee2644f0a6758

6 years agoMerge "Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor Test: make ds-docs...
Jon Dormody [Fri, 1 Dec 2017 16:40:51 +0000 (16:40 +0000)]
Merge "Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor Test: make ds-docs Bug: 1766768" into oc-dev am: ce7f1e6601 am: 3ba37e1f53
am: 96dad7e0a3

Change-Id: Ib8bbd7fa3dfc9ee5caa3b9f7f2696c7461c3faf3

6 years agoMerge "Docs: Added mention that the getSharedPreferences method is thread safe."...
Jon Dormody [Fri, 1 Dec 2017 16:28:29 +0000 (16:28 +0000)]
Merge "Docs: Added mention that the getSharedPreferences method is thread safe." into oc-dev am: fb839ce59a am: 728ca235b5
am: 37db2694eb

Change-Id: I98151cf907cd2f635c8f4a0e128ff697024b3a54

6 years agoMerge "Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor Test: make ds-docs...
Jon Dormody [Fri, 1 Dec 2017 16:28:14 +0000 (16:28 +0000)]
Merge "Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor Test: make ds-docs Bug: 1766768" into oc-dev am: ce7f1e6601
am: 3ba37e1f53

Change-Id: Ia807c8ccd0db5b37b010f64a417fc8e105c22866

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 1 Dec 2017 16:24:35 +0000 (16:24 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoRemove old BackupManagerService
Bernardo Rufino [Thu, 30 Nov 2017 16:17:26 +0000 (16:17 +0000)]
Remove old BackupManagerService

As discussed, only removed the class, local interface and trampoline
still exist. That will go into a next CL.

Bug: 65823538
Test: make RunFrameworksServicesRoboTests
Test: runtest -p com.android.server.backup frameworks-services
Test: gts-tradefed run commandAndExit gts-dev -m GtsBackupTestCases
Test: gts-tradefed run commandAndExit gts-dev -m GtsBackupHostTestCases
Test: cts-tradefed run commandAndExit cts-dev -m CtsBackupTestCases
Test: adb shell bmgr backupnow <kv and full-backup packages>
Test: adb backup & adb restore
Change-Id: Ifcb4c02e364b8c4899ff376ff20cd8c89fc1af28

6 years agoMerge "Fixes NPE when system update couldn't be parsed"
TreeHugger Robot [Fri, 1 Dec 2017 16:18:20 +0000 (16:18 +0000)]
Merge "Fixes NPE when system update couldn't be parsed"

6 years agoMerge "Docs: Added mention that the getSharedPreferences method is thread safe."...
Jon Dormody [Fri, 1 Dec 2017 16:16:53 +0000 (16:16 +0000)]
Merge "Docs: Added mention that the getSharedPreferences method is thread safe." into oc-dev am: fb839ce59a
am: 728ca235b5

Change-Id: Ib6d81f2355ef9d902725e2e1ee1cd5337f4294ad

6 years agoMerge "Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor Test: make ds-docs...
Jon Dormody [Fri, 1 Dec 2017 16:14:15 +0000 (16:14 +0000)]
Merge "Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor Test: make ds-docs Bug: 1766768" into oc-dev
am: ce7f1e6601

Change-Id: If7798db1aea1f1d6cdb42a7d25509c814a31f6ca

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 1 Dec 2017 16:11:20 +0000 (16:11 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Docs: Added mention that the getSharedPreferences method is thread safe."...
Jon Dormody [Fri, 1 Dec 2017 16:07:27 +0000 (16:07 +0000)]
Merge "Docs: Added mention that the getSharedPreferences method is thread safe." into oc-dev
am: fb839ce59a

Change-Id: Ic135f510c6e5ff8a9a00f2d2be1fcc0c284dd5cf

6 years agoMerge "Ensure that debug builds crash again if there is a BinderProxy leak." am:...
Hans Boehm [Fri, 1 Dec 2017 16:07:00 +0000 (16:07 +0000)]
Merge "Ensure that debug builds crash again if there is a BinderProxy leak." am: db122f90d9 am: 4fc1bb0e37
am: 9020d22c6d

Change-Id: I53f503ff0826030d2a112e41555b5e32b9524b5d

6 years agoMerge "Ensure that debug builds crash again if there is a BinderProxy leak." am:...
Hans Boehm [Fri, 1 Dec 2017 15:56:23 +0000 (15:56 +0000)]
Merge "Ensure that debug builds crash again if there is a BinderProxy leak." am: db122f90d9
am: 4fc1bb0e37

Change-Id: I949a3896f7613fe8bd3d92badba0fea5b3343e39

6 years agoMerge "Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor Test: make ds-docs...
Jon Dormody [Fri, 1 Dec 2017 15:53:36 +0000 (15:53 +0000)]
Merge "Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor Test: make ds-docs Bug: 1766768" into oc-dev

6 years agoMerge "Docs: Added mention that the getSharedPreferences method is thread safe."...
Jon Dormody [Fri, 1 Dec 2017 15:52:54 +0000 (15:52 +0000)]
Merge "Docs: Added mention that the getSharedPreferences method is thread safe." into oc-dev

6 years agoMerge "Ensure that debug builds crash again if there is a BinderProxy leak."
Hans Boehm [Fri, 1 Dec 2017 15:46:09 +0000 (15:46 +0000)]
Merge "Ensure that debug builds crash again if there is a BinderProxy leak."
am: db122f90d9

Change-Id: Ibc470d844139fd2f74434a26d01903c67eb51f86

6 years agoMerge "Ensure that debug builds crash again if there is a BinderProxy leak."
Hans Boehm [Fri, 1 Dec 2017 15:34:29 +0000 (15:34 +0000)]
Merge "Ensure that debug builds crash again if there is a BinderProxy leak."

6 years agoMerge "Enable Skia shader cache"
TreeHugger Robot [Fri, 1 Dec 2017 14:39:35 +0000 (14:39 +0000)]
Merge "Enable Skia shader cache"

6 years agoMerge "Storage refactor for EntityConfidence"
TreeHugger Robot [Fri, 1 Dec 2017 12:36:56 +0000 (12:36 +0000)]
Merge "Storage refactor for EntityConfidence"

6 years agoMerge "Binding on-demand #3: updateTransportAttributes() API"
Bernardo Rufino [Fri, 1 Dec 2017 12:06:23 +0000 (12:06 +0000)]
Merge "Binding on-demand #3: updateTransportAttributes() API"

6 years agoAAPT2: Use manifest parsing to determine format of APK.
Pierre Lecesne [Fri, 1 Dec 2017 11:39:01 +0000 (11:39 +0000)]
AAPT2: Use manifest parsing to determine format of APK.

This makes it possible to load APKs that don't have a resource table.

Bug: 69355482
Test: Manual
Change-Id: I8471dbe068e836b4beea9e6934d18dd16b70ef02

6 years agoMerge "Build overlaytests as part of the normal build" am: ce2362fc7d am: 08d7ee4111
Paul Duffin [Fri, 1 Dec 2017 10:44:52 +0000 (10:44 +0000)]
Merge "Build overlaytests as part of the normal build" am: ce2362fc7d am: 08d7ee4111
am: 58257c8891

Change-Id: I6ff4f390aa2e5084aab93a0a82bcdcdbebadb5f3

6 years agoMerge "Build overlaytests as part of the normal build" am: ce2362fc7d
Paul Duffin [Fri, 1 Dec 2017 10:35:20 +0000 (10:35 +0000)]
Merge "Build overlaytests as part of the normal build" am: ce2362fc7d
am: 08d7ee4111

Change-Id: Ie4c50aa2447316edb1c02e1f65dcacf35c24d5f0

6 years agoMerge "Build overlaytests as part of the normal build"
Paul Duffin [Fri, 1 Dec 2017 10:26:30 +0000 (10:26 +0000)]
Merge "Build overlaytests as part of the normal build"
am: ce2362fc7d

Change-Id: I11c3b75763f5bd5c8c4239d9a5135da7e18df03f

6 years agoMerge "Build overlaytests as part of the normal build"
Paul Duffin [Fri, 1 Dec 2017 10:16:56 +0000 (10:16 +0000)]
Merge "Build overlaytests as part of the normal build"

6 years agoStorage refactor for EntityConfidence
Jan Althaus [Thu, 30 Nov 2017 14:01:40 +0000 (15:01 +0100)]
Storage refactor for EntityConfidence

Caching the sorted entity list so users don't need to be careful to cache
the result of getEntities (previously dont by TextSelection and
TextClassification, but not TextLink). Also switched to ArrayMap as it's
better suited for small maps like the ones generated by the classifier.

Test: Ran FrameworksCoreTests
Change-Id: I08cc9f72146ccab88b6a3624f3775a366c814f7a

6 years agoMerge "Split NotificationUserManager out of StatusBar."
TreeHugger Robot [Fri, 1 Dec 2017 08:36:32 +0000 (08:36 +0000)]
Merge "Split NotificationUserManager out of StatusBar."

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 1 Dec 2017 08:15:56 +0000 (08:15 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 1 Dec 2017 07:57:50 +0000 (07:57 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Changed Dataset.setValue() methods to allow filtering with authentication."
TreeHugger Robot [Fri, 1 Dec 2017 07:29:06 +0000 (07:29 +0000)]
Merge "Changed Dataset.setValue() methods to allow filtering with authentication."

6 years agoMerge "Merge "Quick fix the getMobileNetworkOperator() in CellIdentity." am: 298d2a46...
Android Build Merger (Role) [Fri, 1 Dec 2017 05:53:23 +0000 (05:53 +0000)]
Merge "Merge "Quick fix the getMobileNetworkOperator() in CellIdentity." am: 298d2a46dc am: 3ba72e7130 am: 9afe3b1252"

6 years agoMerge "Quick fix the getMobileNetworkOperator() in CellIdentity." am: 298d2a46dc...
Cassie [Fri, 1 Dec 2017 05:51:17 +0000 (05:51 +0000)]
Merge "Quick fix the getMobileNetworkOperator() in CellIdentity." am: 298d2a46dc am: 3ba72e7130
am: 9afe3b1252

Change-Id: Ib1db63334919e6d8f605fb2b342265cd71348982

6 years agoMerge "Make sure apps cannot forge package name on AssistStructure used for Autofill."
TreeHugger Robot [Fri, 1 Dec 2017 05:48:34 +0000 (05:48 +0000)]
Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill."

6 years agoMerge "Quick fix the getMobileNetworkOperator() in CellIdentity." am: 298d2a46dc
Cassie [Fri, 1 Dec 2017 05:40:36 +0000 (05:40 +0000)]
Merge "Quick fix the getMobileNetworkOperator() in CellIdentity." am: 298d2a46dc
am: 3ba72e7130

Change-Id: I426e70c17a222773267b0c482c930ccdb0c20b4a

6 years agoChanged Dataset.setValue() methods to allow filtering with authentication.
Felipe Leme [Tue, 21 Nov 2017 23:00:00 +0000 (15:00 -0800)]
Changed Dataset.setValue() methods to allow filtering with authentication.

The Dataset.setValue() methods were created before Datasets supported
RemoteViews as presentation. As such, the service always had to provide a
value for the dataset fields, and the value could not be used for filtering
(otherwise the user could "guess" what that authenticaed values were).

But once Dataset required RemoteViews for presentation, the field values were
not used anymore when the dataset required authentication (in fact, the
setValue() methods accepted null for the value), so now we can always use the
field values for filtering.

Test: atest CtsAutoFillServiceTestCases
Fixes: 69458842

Change-Id: Ia58af8bb946f31c3806c28570b2445870d7ccf0c

6 years agoMerge "Quick fix the getMobileNetworkOperator() in CellIdentity."
Cassie [Fri, 1 Dec 2017 05:30:06 +0000 (05:30 +0000)]
Merge "Quick fix the getMobileNetworkOperator() in CellIdentity."
am: 298d2a46dc

Change-Id: I53f8165577dc7cdd98301b5752a32cc19d0dc8b3

6 years agoMerge "Quick fix the getMobileNetworkOperator() in CellIdentity."
Treehugger Robot [Fri, 1 Dec 2017 05:19:29 +0000 (05:19 +0000)]
Merge "Quick fix the getMobileNetworkOperator() in CellIdentity."

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 1 Dec 2017 04:47:15 +0000 (20:47 -0800)]
Import translations. DO NOT MERGE

Change-Id: Id3187a7c7c1e6335cd9c9e21b6b9745ae5e6d602
Auto-generated-cl: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 1 Dec 2017 03:28:29 +0000 (19:28 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ic0e0a1b84ccf3a776036e3fc7de800c34bc9150f
Auto-generated-cl: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 1 Dec 2017 03:24:07 +0000 (19:24 -0800)]
Import translations. DO NOT MERGE

Change-Id: I5aacf46b7cfef20b34566d1c3f3946185b25ea58
Auto-generated-cl: translation import

6 years agoMerge changes from topic "disable-avb-runtime-vintf"
TreeHugger Robot [Fri, 1 Dec 2017 03:14:51 +0000 (03:14 +0000)]
Merge changes from topic "disable-avb-runtime-vintf"

* changes:
  Disable AVB check in runtime vintf
  Revert "Disable checking AVB in runtime vintf"

6 years agoMerge "Whitelist SettingsIntelligence to manage fingerprint"
TreeHugger Robot [Fri, 1 Dec 2017 03:13:14 +0000 (03:13 +0000)]
Merge "Whitelist SettingsIntelligence to manage fingerprint"

6 years agoMerge "Oops, need to return on success."
TreeHugger Robot [Fri, 1 Dec 2017 02:39:25 +0000 (02:39 +0000)]
Merge "Oops, need to return on success."

6 years agoMerge "1/ Only expose thread-safe interfaces in metric producer. 2/ Simplify lock...
TreeHugger Robot [Fri, 1 Dec 2017 02:33:08 +0000 (02:33 +0000)]
Merge "1/ Only expose thread-safe interfaces in metric producer. 2/ Simplify lock logic. 3/ Add test for duration metric producer."

6 years agoMerge "[RTT2] Direct Aware Responder configuration"
TreeHugger Robot [Fri, 1 Dec 2017 02:02:58 +0000 (02:02 +0000)]
Merge "[RTT2] Direct Aware Responder configuration"

6 years agoMerge changes I80504f43,Ifc372eef am: de7be840a7 am: 991da81069
Calin Juravle [Fri, 1 Dec 2017 01:53:42 +0000 (01:53 +0000)]
Merge changes I80504f43,Ifc372eef am: de7be840a7 am: 991da81069
am: 74964ffb8a  -s ours

Change-Id: Ib31d864dd8ba45c2489b527ea095d69d3a4b456b

6 years agoMerge changes I80504f43,Ifc372eef am: de7be840a7
Calin Juravle [Fri, 1 Dec 2017 01:43:30 +0000 (01:43 +0000)]
Merge changes I80504f43,Ifc372eef am: de7be840a7
am: 991da81069

Change-Id: I7adfdd87dc63d5ab3a34e152cf1066f4498036e8

6 years agoMake sure apps cannot forge package name on AssistStructure used for Autofill.
Felipe Leme [Fri, 1 Dec 2017 01:41:57 +0000 (17:41 -0800)]
Make sure apps cannot forge package name on AssistStructure used for Autofill.

Test: atest CtsAutoFillServiceTestCases:VirtualContainerActivityTest#testAppCannotFakePackageName
Test: atest CtsAutoFillServiceTestCases
Fixes: 69981710

Change-Id: Id6036cddb51dd8dd0c9128b7212d573f630d693f

6 years agoMerge changes I80504f43,Ifc372eef
Calin Juravle [Fri, 1 Dec 2017 01:33:54 +0000 (01:33 +0000)]
Merge changes I80504f43,Ifc372eef
am: de7be840a7

Change-Id: Id86c979498e13f5e382c5a448becee8f7bfe72f0

6 years agoMerge changes I80504f43,Ifc372eef
Treehugger Robot [Fri, 1 Dec 2017 01:09:30 +0000 (01:09 +0000)]
Merge changes I80504f43,Ifc372eef

* changes:
  Fix package install flow w.r.t. dexopt
  Do not apply app-link autoVerify policy to instant app installs

6 years agoMerge "IMS: Add new APIs for call barring operations" am: c1c29dbf45 am: 1468d0f7e5
Jordan Liu [Fri, 1 Dec 2017 01:01:29 +0000 (01:01 +0000)]
Merge "IMS: Add new APIs for call barring operations" am: c1c29dbf45 am: 1468d0f7e5
am: 124570a13a

Change-Id: I1b18caa414e9a18d26d8b0151f6500c3d4fbe3ed

6 years agoMerge "Extreme battery saver: Remove spammy WTF."
TreeHugger Robot [Fri, 1 Dec 2017 00:53:27 +0000 (00:53 +0000)]
Merge "Extreme battery saver: Remove spammy WTF."

6 years agoMerge "IMS: Add new APIs for call barring operations" am: c1c29dbf45
Jordan Liu [Fri, 1 Dec 2017 00:48:02 +0000 (00:48 +0000)]
Merge "IMS: Add new APIs for call barring operations" am: c1c29dbf45
am: 1468d0f7e5

Change-Id: I05080f7865a599cb6e41fd9e5a35f4b631880d9f

6 years agoMerge "[AWARE] Make PeerHandle comparable/hashable"
Etan Cohen [Fri, 1 Dec 2017 00:46:02 +0000 (00:46 +0000)]
Merge "[AWARE] Make PeerHandle comparable/hashable"

6 years agoMerge "IMS: Add new APIs for call barring operations"
Jordan Liu [Fri, 1 Dec 2017 00:36:14 +0000 (00:36 +0000)]
Merge "IMS: Add new APIs for call barring operations"
am: c1c29dbf45

Change-Id: Ibb11c26494791baac116fb561c03cbdc371766a1

6 years agoMerge "Revert "Export libkeystore_aidl to PDK.""
Jordan Liu [Fri, 1 Dec 2017 00:32:48 +0000 (00:32 +0000)]
Merge "Revert "Export libkeystore_aidl to PDK.""

6 years agoRevert "Export libkeystore_aidl to PDK."
Jordan Liu [Fri, 1 Dec 2017 00:27:28 +0000 (00:27 +0000)]
Revert "Export libkeystore_aidl to PDK."

This reverts commit a585a370b643b56d9d106d38eed6de534dc57e3e.

Change-Id: Ifac6f818384d9d1b22cfb36128738533112efe56

6 years agoMerge "IMS: Add new APIs for call barring operations"
Jordan Liu [Fri, 1 Dec 2017 00:25:43 +0000 (00:25 +0000)]
Merge "IMS: Add new APIs for call barring operations"

6 years agoFixes NPE when system update couldn't be parsed
Patrick Baumann [Wed, 29 Nov 2017 21:59:13 +0000 (13:59 -0800)]
Fixes NPE when system update couldn't be parsed

Change-Id: I9034ea2e9411dff79657b86fbfd2418c073621ea
Fixes: 67235938
Test: manual - update system with already installed app and reboot

6 years agoOops, need to return on success.
Jeff Sharkey [Fri, 1 Dec 2017 00:11:40 +0000 (17:11 -0700)]
Oops, need to return on success.

Otherwise we fall through to throw.

Test: builds, boots
Bug: 69948475
Change-Id: I8e0543455649861611adae15ed1692bf79c94abe

6 years agoMerge "Fix small typo in IME assignment."
TreeHugger Robot [Thu, 30 Nov 2017 23:59:22 +0000 (23:59 +0000)]
Merge "Fix small typo in IME assignment."

6 years ago[RTT2] Direct Aware Responder configuration
Etan Cohen [Tue, 28 Nov 2017 15:27:08 +0000 (07:27 -0800)]
[RTT2] Direct Aware Responder configuration

Direct Aware Responder configuration set to the basic rates (discovery
channel 6, 20MHz bandwidth). It is expected that these will be ignored
and that (with a Ranging enabled Responder Publisher) enabled on the peer
a high accuracy RTT will be negotiated.

Bug: 67678464
Test: unit test & integration test (non-functional at this point)
Change-Id: I240cfef91a968cd1eb75a71b5ead96ae4eccb32d

6 years ago[AWARE] Make PeerHandle comparable/hashable
Etan Cohen [Mon, 6 Nov 2017 15:58:15 +0000 (07:58 -0800)]
[AWARE] Make PeerHandle comparable/hashable

Add public equals()/hash() methods to PeerHandle. Allows the handle to
be used across multiple calls/sessions.

Bug: 68931709
Test: builds, unit test, integration test
Change-Id: Idc59269d4275181ed6d9a793213c681dc4e98134

6 years agodocs: Add note to getFrameAtTime() pointing to getScaledFrameAtTime()
Andrew Solovay [Wed, 29 Nov 2017 22:51:40 +0000 (14:51 -0800)]
docs: Add note to getFrameAtTime() pointing to getScaledFrameAtTime()

Added a note to the various getFrame... methods saying that if you
don't need a full-resolution frame, getScaledFrameAtTime() is
preferable. Removed existing text suggesting you use those other
methods for fetching a thumbnail.

Staged revised doc to:

http://go/dac-stage/reference/android/media/MediaMetadataRetriever.html

Bug: 69804003
Test: make ds-docs
Change-Id: I54250b2d127987ef3c1633c011f5eac6b747372e

6 years agoQuick fix the getMobileNetworkOperator() in CellIdentity.
Cassie [Thu, 30 Nov 2017 23:54:51 +0000 (15:54 -0800)]
Quick fix the getMobileNetworkOperator() in CellIdentity.

Bug: 69915536
Test: Basic telephony sanity
Change-Id: Iac8222055aea95fbb5334876124ce9d1571ae2f6

6 years agoMerge "Merge "Fix warning from clang+mingw" am: 7fce15dc5e am: 31bcd7acea am: e2a0c1d062"
Android Build Merger (Role) [Thu, 30 Nov 2017 23:52:44 +0000 (23:52 +0000)]
Merge "Merge "Fix warning from clang+mingw" am: 7fce15dc5e am: 31bcd7acea am: e2a0c1d062"

6 years agoMerge "Export libkeystore_aidl to PDK."
TreeHugger Robot [Thu, 30 Nov 2017 23:51:14 +0000 (23:51 +0000)]
Merge "Export libkeystore_aidl to PDK."

6 years agoMerge "Fix warning from clang+mingw" am: 7fce15dc5e am: 31bcd7acea
Dan Willemsen [Thu, 30 Nov 2017 23:51:04 +0000 (23:51 +0000)]
Merge "Fix warning from clang+mingw" am: 7fce15dc5e am: 31bcd7acea
am: e2a0c1d062

Change-Id: I9212bf71035641d5efedf8f06627a62e9694806c

6 years agoWhitelist SettingsIntelligence to manage fingerprint
Fan Zhang [Thu, 30 Nov 2017 22:11:44 +0000 (14:11 -0800)]
Whitelist SettingsIntelligence to manage fingerprint

This permission used to be Settings. With new settings suggestion
system we need the permission in the unbundled app (SettingsIntelligence)

Bug: 69427300
Test: rebuild
Change-Id: Iaf8dd3281f4cdf5460dd544f50391ca241716d37

6 years agoFix package install flow w.r.t. dexopt
Calin Juravle [Thu, 16 Nov 2017 00:28:01 +0000 (16:28 -0800)]
Fix package install flow w.r.t. dexopt

Calling dexopt before the applicationInfo gets the uid is wrong.
Dexopt needs to be able to set the GID of the odex file to the
UserHandle.getSharedAppGid(pkg.applicationInfo.uid) and that is
possible only with a valid uid.

Move the dexopt logic after installNewPackageLIF/replacePackageLIF
to ensure that we get a valid uid.

Bug: 69331247
Test: adb install & check the GID of the compiler artifacts

(cherry picked from commit c6540daf8388ce1ebd2e4157ec70b9651ae14b4f)

Merged-In: I2434a1a0b9015091a9af2009b3f785b7a16e1256
Change-Id: I80504f434e1507f30f366d1122224ff959bec4a1

6 years agoDo not apply app-link autoVerify policy to instant app installs
Christopher Tate [Thu, 5 Oct 2017 00:38:20 +0000 (17:38 -0700)]
Do not apply app-link autoVerify policy to instant app installs

Bug: 66698768
Test: manual

(cherry picked from commit 05941b396a44bd81c143b727e5c4c630212228e0)

Merged-In: Ib9bea22bf8096e708eef93934e0e972be3a2a4c5
Change-Id: Ifc372eef9bc2a140b9252c85f9be0c2ff9cdbb4c

6 years agoEnsure that debug builds crash again if there is a BinderProxy leak.
Hans Boehm [Fri, 3 Nov 2017 22:56:59 +0000 (15:56 -0700)]
Ensure that debug builds crash again if there is a BinderProxy leak.

This fails when trying to run the AOSP mailer with CRASH_AT_SIZE = 500,
when the check interval is reduced sufficiently so that the test is
actually executed. System server has been observed to use more than
1000 BinderProxies. Thus 5000 seems like roughly the lowest safe limit.

Note that the test is executed somewhat rarely, so we may exceed
this number by quite a few before we actually crash.

Bug: 65760710
Test: Builds, AOSP boots & works for a few tasks. Fails as expected
with reduced limit.

Change-Id: I1c999b85e1ba1bd1d166a9ffba4f0b3992ffee45

6 years agoMerge "Fix warning from clang+mingw" am: 7fce15dc5e
Dan Willemsen [Thu, 30 Nov 2017 23:26:44 +0000 (23:26 +0000)]
Merge "Fix warning from clang+mingw" am: 7fce15dc5e
am: 31bcd7acea

Change-Id: Ibb5c891fe3c219d75be8c124c9be215a31b2a241

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 30 Nov 2017 23:24:25 +0000 (15:24 -0800)]
Import translations. DO NOT MERGE

Change-Id: I34f66bb32c6cf1e0ca1de2b3c7cf8d38c7011605
Auto-generated-cl: translation import

6 years agoMerge "Fix warning from clang+mingw"
Dan Willemsen [Thu, 30 Nov 2017 23:18:38 +0000 (23:18 +0000)]
Merge "Fix warning from clang+mingw"
am: 7fce15dc5e

Change-Id: I1b318913c3ead77369bdb62c10e5e08803cb10b8

6 years agoMerge "Fix scrolling of fill UI anchored to a virtual view - framework"
TreeHugger Robot [Thu, 30 Nov 2017 23:15:24 +0000 (23:15 +0000)]
Merge "Fix scrolling of fill UI anchored to a virtual view - framework"

6 years agoMerge "allow dump_report command to output proto binary in addition to text"
TreeHugger Robot [Thu, 30 Nov 2017 23:11:49 +0000 (23:11 +0000)]
Merge "allow dump_report command to output proto binary in addition to text"

6 years agoMerge "Add/fix a few statsd atoms"
TreeHugger Robot [Thu, 30 Nov 2017 23:09:38 +0000 (23:09 +0000)]
Merge "Add/fix a few statsd atoms"

6 years agoMerge "Fix warning from clang+mingw"
Dan Willemsen [Thu, 30 Nov 2017 23:07:47 +0000 (23:07 +0000)]
Merge "Fix warning from clang+mingw"

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master am: 4f9f278341 ...
Bill Yi [Thu, 30 Nov 2017 23:02:50 +0000 (23:02 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 4f9f278341  -s ours
am: 54a7cba934  -s ours

Change-Id: I110a38779c30ddccd6edfbda30d7e7ae449b8019

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master am: 2c6f7366fc ...
Bill Yi [Thu, 30 Nov 2017 22:57:21 +0000 (22:57 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 2c6f7366fc  -s ours
am: 2c57ac25c6  -s ours

Change-Id: I71ff293a1279cd06e1cb063cc2c22db160cd31f0

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Thu, 30 Nov 2017 22:49:12 +0000 (22:49 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 4f9f278341  -s ours

Change-Id: Ie1b2dd5295272eb2bcc538b7b49fc397a9515ea7

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master am: 7e3f498034 ...
Bill Yi [Thu, 30 Nov 2017 22:47:20 +0000 (22:47 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 7e3f498034  -s ours
am: eed023e369  -s ours

Change-Id: I0d0498ef37b888e9b4c04e09c710bbcc16c6a3da