Commit Graph

73885 Commits

Author SHA1 Message Date
Christine Franks
a35b696054 Merge "Remove RetailDemoModeServiceInternal" into oc-mr1-dev
am: cfb5d97c3f

Change-Id: I614791d2b37573eebfb0a1e5b6da6993267e0f62
2017-07-26 03:35:32 +00:00
Christine Franks
cfb5d97c3f Merge "Remove RetailDemoModeServiceInternal" into oc-mr1-dev 2017-07-26 03:26:23 +00:00
Todd Kennedy
513125a7e3 Merge "compressed images on system partition" into oc-mr1-dev
am: 94902c46ba

Change-Id: If75e5600436193b69386eb4d3f563e9bd6242caf
2017-07-26 01:22:20 +00:00
TreeHugger Robot
94902c46ba Merge "compressed images on system partition" into oc-mr1-dev 2017-07-26 01:09:33 +00:00
Christine Franks
e9e9fb257f Remove RetailDemoModeServiceInternal
Bug: 62712426
Test: make -j100
Change-Id: I0b852aef30a8cadcda08fcff1dcf861aac2a4d7e
2017-07-26 00:40:53 +00:00
Makoto Onuki
380354dcd5 Merge "Don't unbind from the sync adapter before cancelSync()." into oc-dr1-dev am: 906d8f57bf
am: 5d26d8ab06

Change-Id: I9983f42efb88fcb4e837ced6e243e32f05b3ef16
2017-07-25 23:17:20 +00:00
Makoto Onuki
5d26d8ab06 Merge "Don't unbind from the sync adapter before cancelSync()." into oc-dr1-dev
am: 906d8f57bf

Change-Id: Ied5b515396764d398807c4f945aaf55af87de03a
2017-07-25 22:58:23 +00:00
TreeHugger Robot
906d8f57bf Merge "Don't unbind from the sync adapter before cancelSync()." into oc-dr1-dev 2017-07-25 20:49:39 +00:00
Seigo Nonaka
1c31780967 Merge "Support font resource in TextAppearanceSpan" into oc-mr1-dev
am: f0176103a2

Change-Id: I338ec369af7c076f82ecfc08d742d4e1c7cf331a
2017-07-25 19:45:42 +00:00
TreeHugger Robot
f0176103a2 Merge "Support font resource in TextAppearanceSpan" into oc-mr1-dev 2017-07-25 19:35:03 +00:00
Todd Kennedy
7c8addfef0 compressed images on system partition
Change-Id: I43c8c331883b5b381fb0f133fff448f3a57d0fe5
Bug: 36446542
Test: Manual
Test: Create a stub and a compressed application; put on the /system partition
Test: Restart the system and see that it decompresses the full application onto the /data partition
Test: Restart again and see that we skip decompression
Test: Create an invalid compressed application [eg. empty file]
Test: Restart the system and see that the stub is disabled
Test: Restart again and see that we skip decompression
2017-07-25 10:45:13 -07:00
Todd Kennedy
f35abca9a0 Merge "Add API for virtual preloads" into oc-mr1-dev
am: be74124264

Change-Id: I2be1d1af5a02aecaa0f07b90483ca03973b360c3
2017-07-25 16:22:09 +00:00
TreeHugger Robot
be74124264 Merge "Add API for virtual preloads" into oc-mr1-dev 2017-07-25 16:13:08 +00:00
Todd Kennedy
78a72501af Add API for virtual preloads
Virtual preloads are applications that aren't actually on the
/system partition, but, act as if they were. One such distinction
is that these apps receive Intent.ACTION_BOOT_COMPLETED and start
out of the stopped state.

Change-Id: I812d3e7008b9d87e84aa33dbc4b3d8e8b334533c
Fix: 34855677
Test: Manual
Test: Install an app with "--preload"
Test: See that it receives Intent.ACTION_BOOT_COMPLETED
2017-07-25 06:48:39 -07:00
ludi
74f860b509 Merge "Add dump info to IpSecService" am: ec5fc4872e am: 3f3c4f6da4 am: c628b22fe5
am: 59c5732585

Change-Id: Idbc0a6f0c88a023c3954b25cc66c8c65c70085c9
2017-07-25 03:36:41 +00:00
ludi
59c5732585 Merge "Add dump info to IpSecService" am: ec5fc4872e am: 3f3c4f6da4
am: c628b22fe5

Change-Id: I1a5d4c424a3c9e1638d86d177cbf98f0d1bce05d
2017-07-25 03:26:23 +00:00
ludi
c628b22fe5 Merge "Add dump info to IpSecService" am: ec5fc4872e
am: 3f3c4f6da4

Change-Id: Iaa81bf94573f06dc2dbd00e30df283c0ce7a7a76
2017-07-25 03:17:24 +00:00
ludi
3f3c4f6da4 Merge "Add dump info to IpSecService"
am: ec5fc4872e

Change-Id: Idd4c051e4536d32504718fdfd201c7effdeb62e3
2017-07-25 03:07:00 +00:00
Janis Danisevskis
309d2254bf Merge "Refurbish granting mechanism" into oc-dr1-dev-plus-aosp 2017-07-25 00:26:50 +00:00
TreeHugger Robot
a4a68a1481 Merge "Refurbish granting mechanism" into oc-dr1-dev 2017-07-25 00:05:30 +00:00
ludi
b0c95b19ab Add dump info to IpSecService
Bug:38350824

Test: runtest frameworks-net

Change-Id: Ifa11d55e9d337016ad865baada627db3aa8c2db3
2017-07-24 16:03:33 -07:00
Felipe Leme
2c358c08ef Merge "Don't create WindowNode on windows with dettached view." into oc-mr1-dev
am: 70c72263ac

Change-Id: I087ed38bdad56f6b6549fd3ab8a08bb66be22a7b
2017-07-24 20:35:05 +00:00
TreeHugger Robot
70c72263ac Merge "Don't create WindowNode on windows with dettached view." into oc-mr1-dev 2017-07-24 20:21:15 +00:00
Janis Danisevskis
e06f533726 Refurbish granting mechanism
Keystore stores key blobs in with filenames that include the symbolic
name and the uid of the owner. This behaviour should have been
completely opaque to the user keystore. However, the granting mechanism,
by which an app can allow another app to use one of its keys, leaked the
internal structure in that the grantee had to specify the key name with
the granter's uid prefix in order to use the granted key. This in turn
collided with prefix handling in other parts of the framework.

This patch refurbishes the granting mechanism such that keystore can
choose a name for the grant. It uses the original symbolic key name as
prefix and appends _KEYSTOREGRANT_<grant_no> where the grant_no is
chosen as first free slot starting from 0. Each uid has its own grant_no
space.

This changes the grant call such that it now returns a string, which is
the alias name of the newly created grant. The string is empty if the
grant operation failed.

As before apps can still mask granted keys by importing a key with the
exact same name including the added suffix. But everybody deserves the
right to shoot themselves in the foot if they really want to.

Bug: 37264540
Bug: 62237038
Test: run cts-dev --module CtsDevicePolicyManagerTestCases --test
          com.android.cts.devicepolicy.DeviceOwnerTest#testKeyManagement
	  because it grants a key
Merged-In: I047512ba345c25e6e691e78f7a37fc3f97b95d32
Change-Id: I047512ba345c25e6e691e78f7a37fc3f97b95d32
2017-07-24 10:58:33 -07:00
Makoto Onuki
f880d1f9af Merge "Don't keep parceled extras for history broadcasts." into oc-mr1-dev
am: 4fdefef7a1

Change-Id: I1cdaa2edf886e8a00d885363deb85d9d22383e13
2017-07-24 17:54:26 +00:00
Makoto Onuki
4fdefef7a1 Merge "Don't keep parceled extras for history broadcasts." into oc-mr1-dev 2017-07-24 17:42:31 +00:00
Michael Wright
0d0eb6ba09 Merge "Remove non-safe mode boot vibration." into oc-dr1-dev am: 149ff697ff
am: d487520e4c

Change-Id: I5769c233212c941e3f1356b01695680a44d2986a
2017-07-24 13:01:33 +00:00
Michael Wright
d487520e4c Merge "Remove non-safe mode boot vibration." into oc-dr1-dev
am: 149ff697ff

Change-Id: Ie8964116ffb3dccd6b683f0fff764d128107ac4f
2017-07-24 12:52:43 +00:00
Michael Wright
63b79f2340 Merge "Remove non-safe mode boot vibration." into oc-dr1-dev
am: 149ff697ff

Change-Id: I8339730c21619c4249826a5b855657c01757147c
2017-07-24 12:52:38 +00:00
TreeHugger Robot
149ff697ff Merge "Remove non-safe mode boot vibration." into oc-dr1-dev 2017-07-24 12:46:25 +00:00
Janis Danisevskis
6396ccb82e Refurbish granting mechanism
Keystore stores key blobs in with filenames that include the symbolic
name and the uid of the owner. This behaviour should have been
completely opaque to the user keystore. However, the granting mechanism,
by which an app can allow another app to use one of its keys, leaked the
internal structure in that the grantee had to specify the key name with
the granter's uid prefix in order to use the granted key. This in turn
collided with prefix handling in other parts of the framework.

This patch refurbishes the granting mechanism such that keystore can
choose a name for the grant. It uses the original symbolic key name as
prefix and appends _KEYSTOREGRANT_<grant_no> where the grant_no is
chosen as first free slot starting from 0. Each uid has its own grant_no
space.

This changes the grant call such that it now returns a string, which is
the alias name of the newly created grant. The string is empty if the
grant operation failed.

As before apps can still mask granted keys by importing a key with the
exact same name including the added suffix. But everybody deserves the
right to shoot themselves in the foot if they really want to.

Bug: 37264540
Bug: 62237038
Test: run cts-dev --module CtsDevicePolicyManagerTestCases --test
          com.android.cts.devicepolicy.DeviceOwnerTest#testKeyManagement
	  because it grants a key
Merged-In: I047512ba345c25e6e691e78f7a37fc3f97b95d32
Change-Id: I047512ba345c25e6e691e78f7a37fc3f97b95d32
2017-07-23 09:39:04 -07:00
Selim Cinek
137123bdef Merge "Removing contents hidden string for public notifications" into oc-dr1-dev am: 8650c7c0f1
am: 001956c626

Change-Id: Ic1c65063fce8cea01b01569cba6181f4465cd88e
2017-07-23 13:04:49 +00:00
Selim Cinek
001956c626 Merge "Removing contents hidden string for public notifications" into oc-dr1-dev
am: 8650c7c0f1

Change-Id: I4dd8cfab340c595181f52659d552bc03f51818ec
2017-07-23 12:57:20 +00:00
Selim Cinek
3a82a4a0f2 Merge "Removing contents hidden string for public notifications" into oc-dr1-dev
am: 8650c7c0f1

Change-Id: I10d7ab191f47bf167a5be5e0d11d7698aae58cd1
2017-07-23 12:57:19 +00:00
TreeHugger Robot
8650c7c0f1 Merge "Removing contents hidden string for public notifications" into oc-dr1-dev 2017-07-23 12:51:43 +00:00
Romain Guy
99a05a108d Merge "Expose shared buffer mode/auto refresh on Surface" into oc-mr1-dev
am: 572cb5242d

Change-Id: I7b79b055f7ffd9a62a741dfe98c71b9fa079b645
2017-07-22 03:08:29 +00:00
TreeHugger Robot
572cb5242d Merge "Expose shared buffer mode/auto refresh on Surface" into oc-mr1-dev 2017-07-22 03:01:02 +00:00
Makoto Onuki
6098a153e2 Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev am: 5bbf44e715
am: 5eb5ec71fa

Change-Id: I17b1d21e5b7dd5f22a773aa201e0ca42e5038fa6
2017-07-22 01:03:39 +00:00
Makoto Onuki
d9a8191ad6 Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev
am: 5bbf44e715

Change-Id: I0ca842e1a2c2986c0b6fa9d7eca162cb2cb737af
2017-07-22 00:58:01 +00:00
Makoto Onuki
5eb5ec71fa Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev
am: 5bbf44e715

Change-Id: Icb54710f8a76f674c75c79e9992eb03264ff3142
2017-07-22 00:57:59 +00:00
Bookatz
7cb4094e81 Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev am: 2337b3ba84
am: 63959bae98

Change-Id: I0f2c802fb797541f9a4431f1d798ea9f0f1332c0
2017-07-22 00:47:40 +00:00
TreeHugger Robot
5bbf44e715 Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev 2017-07-22 00:45:24 +00:00
Bookatz
63959bae98 Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev
am: 2337b3ba84

Change-Id: Ie29e6ddb7ab37977130adbf566fac18c4dc5c26b
2017-07-22 00:41:57 +00:00
Bookatz
9de5dc9ba8 Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev
am: 2337b3ba84

Change-Id: I9d0a3c1ac05f9583fe98b169037e008cc36315b3
2017-07-22 00:41:54 +00:00
TreeHugger Robot
2337b3ba84 Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev 2017-07-22 00:35:10 +00:00
Love Khanna
b54567810f NFC DTA Integration
Test: compiles.
Merged-In: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
2017-07-21 17:05:47 -07:00
Love Khanna
276f9fe619 NFC DTA Integration
Test: compiles.
Merged-In: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
2017-07-21 17:01:28 -07:00
David Friedman
bad118a0b4 Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug: 34273998 Test: Ran "make" to verify error-free building." into oc-dev am: e4d0557334 am: f20c492190
am: ff160ae465

Change-Id: I38aa24b225827f7a280f5fcd85c08a0424d10b06
2017-07-21 23:57:18 +00:00
David Friedman
93a1ab8ba1 Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug: 34273998 Test: Ran "make" to verify error-free building." into oc-dev am: e4d0557334
am: f20c492190

Change-Id: I57da50e47d3fdfefa245baffdeaf16322b28fa30
2017-07-21 23:57:01 +00:00
Makoto Onuki
97f82f28da Don't keep parceled extras for history broadcasts.
On dumpsys we do show history broadcast intents with extras, but
if an intent's extras are still parceled, we can't show anything
(but the length) anyway, so let's just remove them, because sometimes
they contain heavy objects such as bitmaps.

Bug: 62144301
Test: manual tests: Boot, add account start apps, insert SIM
Change-Id: Ia64dd46d66fba3098e32c435509f4940ae978710
2017-07-21 16:51:16 -07:00