Commit Graph

5702 Commits

Author SHA1 Message Date
Seigo Nonaka
c07169eddc Merge "Introduce early exit path for non resource path." into oc-dev am: 01d5b3d2af
am: 99c587a9b1

Change-Id: I7e09b074f7fff0f273ca2be896439bae0c0c92d0
2017-05-18 23:54:24 +00:00
Seigo Nonaka
99c587a9b1 Merge "Introduce early exit path for non resource path." into oc-dev
am: 01d5b3d2af

Change-Id: I07120a86307dd397862e0d341763d0048b066845
2017-05-18 23:39:41 +00:00
TreeHugger Robot
01d5b3d2af Merge "Introduce early exit path for non resource path." into oc-dev 2017-05-18 23:30:24 +00:00
Makoto Onuki
98c1555da3 Merge "Restrict access to instant app data in usage stats" into oc-dev am: f38a1d3d2a
am: fd1dd05815

Change-Id: I9e06dfc17f934210bcfddb44fc7be7056c9b054c
2017-05-16 22:18:32 +00:00
Makoto Onuki
fd1dd05815 Merge "Restrict access to instant app data in usage stats" into oc-dev
am: f38a1d3d2a

Change-Id: I923a3d6792bddc782382edf1180704167e8918b1
2017-05-16 22:11:46 +00:00
Makoto Onuki
ad623015a1 Restrict access to instant app data in usage stats
- Events are obfuscated based on whether the app was instant or not at
the time each event was logged.

- UsageStats are obfuscated based on whether each app is instant or
not at the moment.

Bug 38202133
Test: Manual test using UsageStatsTest and instant apps

Change-Id: I3c74309196b88d010d317cb0dd6749bf4624e876
2017-05-16 12:33:43 -07:00
Seigo Nonaka
2ea169a2ec Introduce early exit path for non resource path.
Developer can specify android:fontFamily with three ways, pre-defined
font family name, e.g. "sans-serif", path to the font file in resource
directory, e.g. "res/fonts/Roboto-Regular.ttf", or path to the XML font
family file, e.g. "res/fonts/Roboto.xml".

Resources.getFont treats font files and XML files but pre-defined family
name is handled by TextView. Thus, we can early exit if the passed value
is not likely resource path.

This improves the inflation performance.
The score without this patch:
gfx-avg-frame-time-50: 6.9
gfx-avg-frame-time-90: 9.4
gfx-avg-frame-time-95: 10.4
gfx-avg-frame-time-99: 16.7

The score with this patch:
gfx-avg-frame-time-50: 7.0
gfx-avg-frame-time-90: 8.9
gfx-avg-frame-time-95: 9.7
gfx-avg-frame-time-99: 16.5

Measured on bullhead-userdebug.

The APCT perf test improves from
String FontFamily: 200,086 -> 132,561
File FontFamily  : 199,256 -> 161,843
XML FontFamily   : 203,681 -> 158,553

Measured on angler-userdebug.

Bug: 38232467
Test: UiBenchmark
Change-Id: Ia601ae7207ae8c60848c9efdbb9396267a57257c
2017-05-16 10:14:56 -07:00
Svet Ganov
647dc84560 Merge "Support recursive static shared lib dependency" into oc-dev am: e04765998e
am: 8adfc2cac7

Change-Id: Ib07a986a02372d40ce93b9beb8e1ac74f0d3561b
2017-05-16 01:38:57 +00:00
Svet Ganov
8adfc2cac7 Merge "Support recursive static shared lib dependency" into oc-dev
am: e04765998e

Change-Id: I674191296c7d0a409e19614b2f18a4b86bf03ab8
2017-05-16 00:03:00 +00:00
TreeHugger Robot
e04765998e Merge "Support recursive static shared lib dependency" into oc-dev 2017-05-15 23:49:07 +00:00
Svet Ganov
58c99f0207 Support recursive static shared lib dependency
Test: Updated the static shared lib CTS tests to verify that
      All static shared lib CTS tests pass

bug:35359862

Change-Id: Id4a0dabbc9d8e98962e92b6f537f6ffffa63b585
2017-05-15 14:43:17 -07:00
Dianne Hackborn
6cdaf4fe5e Merge "Fix issue #38210653: Few more tweaks of job scheduler" into oc-dev am: c75bd416e9
am: 48e6d1594a

Change-Id: I41a97e988da5069fc186307e519e07e2bb746e83
2017-05-13 20:21:54 +00:00
Dianne Hackborn
48e6d1594a Merge "Fix issue #38210653: Few more tweaks of job scheduler" into oc-dev
am: c75bd416e9

Change-Id: I6c7cf4506c73fbed60bff0d43fb0a588d780d93a
2017-05-13 20:15:14 +00:00
Dianne Hackborn
c75bd416e9 Merge "Fix issue #38210653: Few more tweaks of job scheduler" into oc-dev 2017-05-13 20:08:25 +00:00
Dianne Hackborn
bfc2331f2f Fix issue #38210653: Few more tweaks of job scheduler
- Now keep track of the time a job was enqueued, and order
  the pending list by that.
- Added configuration constants for rescheduling: maximum
  times to reschedule, minimum backoff times.
- Fixed printing of active jobs -- the method to get the current
  JobStatus was old and didn't require the caller to hold a
  lock, so made a copy, which didn't contain all the data we were
  interested in.  Now with our simple locking, we can just make
  that require the caller hold a lock and return the real
  JobStatus object.
- Include oom_adj and procstate when printing information about
  processes being killed.
- Expanded documentation of BroadcastReceiver.goAsync().

Test: bit CtsJobSchedulerTestCases:*

Change-Id: I2e45f181e45be9836c74cbff1b844ffdf6e93019
2017-05-12 17:29:04 -07:00
Todd Kennedy
00adcb06ab Merge "Add command to retrieve the instant app resolver" into oc-dev am: 2a34734131
am: a17fe9cca6

Change-Id: I02a709b4716a65c27cb3c696adbf5da88627c517
2017-05-12 23:40:31 +00:00
Hyunyoung Song
d55a65c69c Merge "Update ShortcutManager/Service javadoc/impl around sizing" into oc-dev am: b9a098aeb6
am: ac9b9de6df

Change-Id: I54760855839f270aadab53c1a851f55b5e676dcd
2017-05-12 23:28:28 +00:00
Todd Kennedy
a17fe9cca6 Merge "Add command to retrieve the instant app resolver" into oc-dev
am: 2a34734131

Change-Id: I928a7c6ecf81163350fe42ea1669f454710dd1b7
2017-05-12 23:20:08 +00:00
TreeHugger Robot
2a34734131 Merge "Add command to retrieve the instant app resolver" into oc-dev 2017-05-12 23:11:51 +00:00
Hyunyoung Song
ac9b9de6df Merge "Update ShortcutManager/Service javadoc/impl around sizing" into oc-dev
am: b9a098aeb6

Change-Id: Ie08ced373f88647afa6d8788ea78dd07ade6decf
2017-05-12 23:08:38 +00:00
TreeHugger Robot
b9a098aeb6 Merge "Update ShortcutManager/Service javadoc/impl around sizing" into oc-dev 2017-05-12 23:01:35 +00:00
Sunny Goyal
51829ae72f Merge "Setting Session commited broadcast when an existing apk is enabled for a different user" into oc-dev am: fc157e702f
am: 1e0a89055d

Change-Id: Ifefcd98f5df6a3175ad2d25aa058555ed02a4854
2017-05-12 21:27:37 +00:00
Sunny Goyal
1e0a89055d Merge "Setting Session commited broadcast when an existing apk is enabled for a different user" into oc-dev
am: fc157e702f

Change-Id: I4cabbad8bac8fb24c86506a89c29d0a34b90a564
2017-05-12 21:16:32 +00:00
Hyunyoung Song
4703746f50 Update ShortcutManager/Service javadoc/impl around sizing
to account for AdaptiveIconDrawable type of shortcuts

Test: builds for now.. If Makoto is happy with this change, will add tests

b/37743074

Change-Id: Ieecd95d621db57f858fac449d3bcedd173c8607c
2017-05-12 11:45:06 -07:00
Sunny Goyal
a31a74b993 Setting Session commited broadcast when an existing apk is enabled for
a different user

Test: Manual tests and CTS
Bug: 38204385
Change-Id: Ic3bddbc2e6070c11b11f0685077db7737f2b8849
2017-05-12 10:00:30 -07:00
Svet Ganov
1623070662 Merge "System/root/shell need to explicitly ask for static libs to get them" into oc-dev am: c3db339987
am: e87dc7bb2c

Change-Id: I444ced398404698c88e1353ee47cd648c9ad9c9f
2017-05-12 08:50:45 +00:00
Svet Ganov
e87dc7bb2c Merge "System/root/shell need to explicitly ask for static libs to get them" into oc-dev
am: c3db339987

Change-Id: I9c00d0c1040929a55638436d7ae703287fe62620
2017-05-12 06:35:43 +00:00
TreeHugger Robot
c3db339987 Merge "System/root/shell need to explicitly ask for static libs to get them" into oc-dev 2017-05-12 03:46:58 +00:00
Adam Lesinski
58a772cfa7 Merge "Fix support for @empty in style resolution" into oc-dev am: 7d75f49175
am: 0532e76302

Change-Id: I0c5ed6e6d149982e98578a02a7afbaa7d6cdfa6c
2017-05-12 03:46:31 +00:00
Adam Lesinski
0532e76302 Merge "Fix support for @empty in style resolution" into oc-dev
am: 7d75f49175

Change-Id: Ie5a046f75a7c7fa13d330b90f3b9a8ff6c5ac373
2017-05-12 01:00:00 +00:00
Svet Ganov
9e77977ffa System/root/shell need to explicitly ask for static libs to get them
Test: manual - settings no longer shows static shared libs
      all shared lib CTS tests pass

bug:36632271

Change-Id: If3363059b5f5300e309b61899af8c2559af317fe
2017-05-11 15:41:39 -07:00
TreeHugger Robot
7d75f49175 Merge "Fix support for @empty in style resolution" into oc-dev 2017-05-11 21:55:24 +00:00
Dianne Hackborn
a54a0df596 Merge "Fix issue #37360626: Apps can schedule alarms (and other things) with temp whitelist" into oc-dev am: c3b938ca5e
am: 8b4c4f09f6

Change-Id: Ia6dd41e08ea31ccc902c4d9ba714e6448898fac4
2017-05-11 19:34:30 +00:00
Dianne Hackborn
8b4c4f09f6 Merge "Fix issue #37360626: Apps can schedule alarms (and other things) with temp whitelist" into oc-dev
am: c3b938ca5e

Change-Id: I585bf57074064761c7d216f05be23d7f044208fa
2017-05-11 18:45:00 +00:00
Adam Lesinski
32e7501a27 Fix support for @empty in style resolution
If @empty is encountered in XML, do not fallback
to searching through the theme.

Bug: 36891052
Test: make aapt2_tests
Test: bit CtsContentTestCases:android.content.res.cts.TypedArrayTest
Change-Id: Ie3bf7b70af9c7913513a1092afd95d26bec5e635
2017-05-11 11:28:29 -07:00
Makoto Onuki
b6511a60e0 Merge "Offload saving bitmaps from binder threads" into oc-dev am: 31ef139466
am: 3b178f77ce

Change-Id: I12603ba93310abaa8612c118ebf77ac25e6918c5
2017-05-11 05:30:01 +00:00
Dianne Hackborn
983055231b Fix issue #37360626: Apps can schedule alarms (and other things) with temp whitelist
There is now an IBinder "token" that must be specified when setting
the whitelist duration for an Intent.  To have the whitelist supplied,
the caller to send a PendingIntent must pass in the same token.  The
PendingIntent and IntentSender classes now internally maintain this token
to pass in when their send() is called.

The big complexity for making this work is we now need to associate this
whitelist token correctly with the actual PendingIntent objects that
applications and other code is getting.  To do this, we propagate the
token in the Notification object, and have a new API on Parcel that allows
us to make it available to PendingIntent when it is unmarshalled.  And
this allows to deal with PendingIntents appearing in nested bundles, as
we can propagate that information from the original Parcel to the new
Parcel that Bundle keeps to delay unmarshalling.

Test: manual
Change-Id: Idda00490ccfe2be37e4ab21354b9ab7528a52750
2017-05-10 17:23:02 -07:00
Makoto Onuki
3b178f77ce Merge "Offload saving bitmaps from binder threads" into oc-dev
am: 31ef139466

Change-Id: I2980b05a8a997e003792fe995973b54eaf29d5e1
2017-05-11 00:06:56 +00:00
TreeHugger Robot
31ef139466 Merge "Offload saving bitmaps from binder threads" into oc-dev 2017-05-10 22:24:14 +00:00
Bryce Lee
c8097441e2 Merge "Prevent non-fullscreen activities from influencing orientation" into oc-dev am: 8a698a1721
am: 537ece988a

Change-Id: Idb7c86cae2974d31a04aefec34a6ee7baeafb7ec
2017-05-10 16:04:32 +00:00
Bryce Lee
537ece988a Merge "Prevent non-fullscreen activities from influencing orientation" into oc-dev
am: 8a698a1721

Change-Id: I7dd30182184fc5ce6ec5e9750eaa26f174b79b38
2017-05-10 15:04:05 +00:00
Makoto Onuki
475c36539d Offload saving bitmaps from binder threads
Bug 34691191
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsShortcutManagerTestCases
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsShortcutHostTestCases
Test: Manual test with the phone app

Change-Id: Ibccf8ca162eae9179ee4cbdf0307ff34a6953aa1
2017-05-09 16:53:01 -07:00
Bryce Lee
3979159456 Prevent non-fullscreen activities from influencing orientation
This changelist enforces that activities targeting O and beyond
can only specify an orientation if they are fullscreen. The
change ignores the orientation on the server side and throws an
exception when the client has an orientation set in onCreate or
invokes Activity#setRequestedOrientation.

Fixes: 33483680
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerAppConfigurationTests#testNonFullscreenActivityProhibited
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerAppConfigurationTests#testLegacyNonFullscreenActivityPermitted
Change-Id: I4f7f79744918fad6465a537633dfadec8d05c6df
2017-05-09 16:13:51 -07:00
Android Build Merger (Role)
38cf6bdc7c Merge "Merge "Remove redundant TextClassificationService" into oc-dev am: 104590844e am: 41564af248" 2017-05-09 17:31:15 +00:00
Abodunrinwa Toki
b59fe93059 Merge "Remove redundant TextClassificationService" into oc-dev am: 104590844e
am: 41564af248

Change-Id: Ib7c77dd40de6c72bd843af680f59972708a4b121
2017-05-09 17:26:01 +00:00
TreeHugger Robot
bd09eb33b4 Merge "Add system feature flag FEATURE_WIFI_PASSPOINT" 2017-05-09 17:21:35 +00:00
Abodunrinwa Toki
41564af248 Merge "Remove redundant TextClassificationService" into oc-dev
am: 104590844e

Change-Id: Ib2881e478819eaff8910f5a0982e4f048e4bb7c1
2017-05-09 16:59:38 +00:00
Abodunrinwa Toki
3de110bbb7 Remove redundant TextClassificationService
Text classification is now being done entirely in the app's proccess.
See android.view.textclassifier.TextClassificationManager
Reverts Ic428d00f291e268211866b3fc6b7acbc3eb04e1e

Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Fixes: 36852122
Change-Id: Iffff3ab6e7d3b761576eb6bdcd5032db34b7a1b2
2017-05-09 13:51:03 +01:00
Philip P. Moltmann
7e6ef30452 Merge changes I7c2c9411,Ibc72c84d,Ib3968644 into oc-dev am: f512575c68
am: 169989822e

Change-Id: I330cd6e1601584e3903a26b27047aae2e7b7c711
2017-05-09 02:18:52 +00:00
Philip P. Moltmann
169989822e Merge changes I7c2c9411,Ibc72c84d,Ib3968644 into oc-dev
am: f512575c68

Change-Id: I590a658c92ad271c7b4f18f5768c1a4e581ffe94
2017-05-09 02:05:24 +00:00