Commit Graph

11946 Commits

Author SHA1 Message Date
Alison Cichowlas
3e0f092077 Merge "Restore app pinning." into qt-qpr1-dev
am: 599634a26b

Change-Id: I808d010ea658badb7aaecc4a62074a18ae97f7d0
2019-11-19 16:18:45 -08:00
Andrei-Valentin Onea
aeed8fb461 Merge "Revert "Revert submission from topic "separate-testing"."" am: addcc36534
am: 97a11fb8ab

Change-Id: I368ccb483ba72c8fea622a3179c7e22aa7d7ab7e
2019-11-19 15:41:46 -08:00
Andrei-Valentin Onea
97a11fb8ab Merge "Revert "Revert submission from topic "separate-testing".""
am: addcc36534

Change-Id: I4de366196f91ef1fe17c617a117b29503f8f68e1
2019-11-19 15:28:29 -08:00
Hall Liu
ae63546d19 Merge commit '1d7a53da981b7d4281c58af7eb9b150163b344a6' into manual_merge_1d7a53da981b7d4281c58af7eb9b150163b344a6
am: dab3711435

Change-Id: Ib75482a87545f7743f0049c8e51c354d2294c2af
2019-11-19 15:12:28 -08:00
Hall Liu
dab3711435 Merge commit '1d7a53da981b7d4281c58af7eb9b150163b344a6' into manual_merge_1d7a53da981b7d4281c58af7eb9b150163b344a6
Change-Id: Ie08d8bb30e48a9e7ade85334c6195a791ecc0d9b
2019-11-19 12:37:24 -08:00
Alison Cichowlas
a40cd3feb8 Restore app pinning.
Bug: 143229724
Test: atest AbstractResolverComparatorTest; atest ChooserActivityTest
Change-Id: I71d4334c8d3beed94495b41d5264a95cbbd132ff
Merged-In: I71d4334c8d3beed94495b41d5264a95cbbd132ff
2019-11-19 19:16:02 +00:00
Satakshi Rana
2613be298f Merge "Screenshot Notification Smart Action: AiAi and - Sys UI integration" into qt-qpr1-dev
am: 73b4e1923a

Change-Id: Ib545347db4b8aa49f2467e785d0572ce2f5d5b25
2019-11-19 09:22:01 -08:00
Satakshi Rana
73b4e1923a Merge "Screenshot Notification Smart Action: AiAi and - Sys UI integration" into qt-qpr1-dev 2019-11-19 17:14:49 +00:00
Andrei-Valentin Onea
addcc36534 Merge "Revert "Revert submission from topic "separate-testing"."" 2019-11-19 14:12:47 +00:00
Satakshi
ce35ce9f08 Screenshot Notification Smart Action: AiAi and - Sys UI integration
Create a constant in ContentSuggestionsManager, which will
be used to pass a hardware bitmap to ContentSuggestionsService.
In the presence of this key in the request extras, we skip taking a
snapshot in ContentSuggestionsPerUserService.
Bitmap is extracted from reading this value from extras in
ContentSuggestionsService.

Create ScreenshotNotificationSmartActionsProvider, which is overridden
in GoogleSystemUI.
Calling AiAi is guarded by a device config flag created in cl/277143225.

(cherry picked from commit d2010f2628 and c45d86fc15)

Test: Manually tested the code in this CL and corresponding change in SystemUIGoogle.
Took a screenshot and verified that AiAi gets invoked and the screenshot notification
shows smart actions.
Ran new tests added in this CL
'atest ScreenshotNotificationSmartActionsTest'
'atest ContentSuggestionsPerUserServiceTest'
Bug: 141634285
Change-Id: I439a4be9aac53fb02b566ae4d438afe3edf2b37a
Merged-In: I439a4be9aac53fb02b566ae4d438afe3edf2b37a
2019-11-18 16:06:08 -08:00
Hall Liu
1d7a53da98 Merge changes from topic "mainline4"
* changes:
  Add new API for Telecom to send phone state
  Minor style correction to avoid merge conflict
  non-mainline telephony related AIDL refactor/decoupling
2019-11-18 22:31:27 +00:00
Andrei Onea
02d81c0c11 Revert "Revert submission from topic "separate-testing"."
This reverts commit 44d9a1d8dd.
Re-land testing for compatibility change gating. This should fix the art
buildbot breakage.

Bug: 140367850
Test: atest PlatformCompatGating
Test: art/tools/buildbot-build.sh --host
Change-Id: I1070e5e62aed67f1b09044b84674b06afc85c8cc
2019-11-18 20:05:54 +00:00
Anna Trostanetski
57d083db3b Merge "Make CompatConfig be package private." am: 688b3aea7c
am: eec638dada

Change-Id: I7c5fec41bd74e19bffcdcbb6a096197f365936a4
2019-11-18 07:10:44 -08:00
Anna Trostanetski
eec638dada Merge "Make CompatConfig be package private."
am: 688b3aea7c

Change-Id: Id8fcdf026bc41b94a3050d9d261b41cbb97a38e5
2019-11-18 07:07:22 -08:00
Anna Trostanetski
688b3aea7c Merge "Make CompatConfig be package private." 2019-11-18 14:51:32 +00:00
Jiyong Park
de26442649 Merge "remove framework_base_subdirs" am: 46397049fe
am: 7cd8f399f7

Change-Id: I1dc1009490d3e1d26257b7490f1a44bd91b91085
2019-11-16 07:35:07 -08:00
Jiyong Park
7cd8f399f7 Merge "remove framework_base_subdirs"
am: 46397049fe

Change-Id: I910bc8f5f7266e70fe3d8549aab51c2e504298a0
2019-11-16 07:31:54 -08:00
Jiyong Park
46397049fe Merge "remove framework_base_subdirs" 2019-11-16 15:21:03 +00:00
Jiyong Park
ced28d531d remove framework_base_subdirs
Metalava no longer requires it at least for droidstubs in this
directory. Even when local_sourcepath is not set, the -sourcepath option
is set to the module directory (frameworks/base in this case), and
metalava tries to find package.html files under the directory to know if
a package is hidden or not.

Exempt-From-Owner-Approval: cherry-pick from internal

Bug: 144264106
Test: m

Merged-In: Idfa2aa392ae1da9582e7691a8c06c986baad5088
(cherry picked from commit e53786e864)
Change-Id: Idfa2aa392ae1da9582e7691a8c06c986baad5088
2019-11-16 20:48:06 +09:00
Jayachandran C
78f84d5abe Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs" am: 337df70e17
am: 0a86ee3b3e

Change-Id: I2b1be68cd2eea8a4795a882933ed91dbf6ed83ee
2019-11-15 22:11:01 -08:00
Jayachandran C
0a86ee3b3e Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs"
am: 337df70e17

Change-Id: Iba519e0e11af591d93f9bca5e09aab6191240b39
2019-11-15 19:11:44 -08:00
Chen Xu
8eb62f9485 non-mainline telephony related AIDL refactor/decoupling
1. decouple IOnSubscriptionChangedListener AIDL from telephonyMainline
2. other refactor. moving APIs which will not be included in
telephony mainline to frameworks/base/core/java/android/telephony.
Moving internal classes like AIDL which will not be included in
telephony mainline to
framework/base/core/java/com/android/internal/telephony

Bug: 140908357
Test: Build & unit test
Change-Id: I9413ef758cceadd251d03f3b5ea1054cc48ef044
Merged-In: I9413ef758cceadd251d03f3b5ea1054cc48ef044
2019-11-15 18:02:40 -08:00
Jayachandran C
16dce22bf5 Remove usage of Telephonymanager getDefault() and from() hidden APIs
This CL changes to use getSystemService(TelephonyManager.class)

Bug: 140768340
Test: Build
Change-Id: I1fcf2c17456f126584df359547f64c07c168aa65
2019-11-15 15:46:43 -08:00
James O'Leary
fe08abee19 [DO NOT MERGE] Convert TakeScreenshot finishers Runnables to Consumer<Uri>
am: 712eb51dc9

Change-Id: I1a5cc3ceef3f95e02abcbe86fcafd56e19aedc65
2019-11-15 14:05:59 -08:00
James O'Leary
712eb51dc9 [DO NOT MERGE] Convert TakeScreenshot finishers Runnables to Consumer<Uri>
Test: n/a
Bug: b/131082115
Change-Id: Ia84d034d08ff4d004fc9852dc5156d46059e8b00
2019-11-15 16:41:21 +00:00
atrost
f69bbe1a45 Make CompatConfig be package private.
All access will go through PlatformCompat Service.
This is a step towards having callbacks upon a config change, which is
needed for seLinux support.

Test: test app + adb command locally
Bug: 143539591
Bug: 143758748
Change-Id: I31d1c40e99894e77e85a8c33eb07ed9052c8e43a
2019-11-15 16:34:32 +00:00
Martijn Coenen
c272f94077 Merge "Re-land: Reconcile Zygote process name code with Q release." into stage-aosp-master
am: 0b5937472e

Change-Id: I4edfa7f78dc60bef5d681b0ae268f1d1f1d15b03
2019-11-15 00:16:45 -08:00
Martijn Coenen
0807f15eba Re-land: Reconcile Zygote process name code with Q release.
Re-landing due to merge from staging branch reverting fix.

Some Zygote code that was pushed to AOSP master is different from the
pushed Q release. In particular, a call to set the process name for a
Zygote child was missing, causing an app zygote test to fail.

Bug: 139535125
Test: atest android.app.cts.ServiceTest#testAppZygoteServices
Change-Id: I9cb47cea2295dd6c7df16722d3bb474185b7dc6b
Merged-In: Ice3eb966a88e6de5bc8834b60b54bcac31bf31db
2019-11-14 23:48:14 +00:00
Artur Satayev
756d3b447a Merge "Add @UnsupportedAppUsage annotations for greylist." am: 423c3a32d6
am: 7a565c45b1

Change-Id: I48075ef4296e0b55c0055f7364c5129bbd60e9ed
2019-11-11 09:33:13 -08:00
Artur Satayev
7a565c45b1 Merge "Add @UnsupportedAppUsage annotations for greylist."
am: 423c3a32d6

Change-Id: I5387b4742fdaf67ad3189356f2361f73969b53a8
2019-11-11 09:13:24 -08:00
Artur Satayev
3be4d59369 Merge "Add @UnsupportedAppUsage annotations for max-p." am: 8893f158c6
am: da4d6567c2

Change-Id: Iff80c388dec2c6f8184b739be6fb38b8ec8a1a49
2019-11-08 09:49:03 -08:00
Artur Satayev
da4d6567c2 Merge "Add @UnsupportedAppUsage annotations for max-p."
am: 8893f158c6

Change-Id: I2f249063c274b54a58a24cda23f1d5a60fa14540
2019-11-08 09:38:12 -08:00
Artur Satayev
fc46be7dbd Add @UnsupportedAppUsage annotations for greylist.
go/cleanup-greylist-txt

These have already been greylisted, however due to bugs/omissions in the tooling have been kept in go/greylist-txt instead of being annotated in the code.

Bug: 137350495
Test: m

Change-Id: Id6c1f5e403a0e66edb1102ee45f3bf19f244fb09
Merged-In: Id6c1f5e403a0e66edb1102ee45f3bf19f244fb09
2019-11-08 16:17:13 +00:00
Artur Satayev
ee9c6e7571 Add @UnsupportedAppUsage annotations for max-p.
See go/UnsupportedAppUsage for more details.

These have already been greylisted, however due to bugs/omissions in the tooling have been kept in go/greylist-txt instead of being annotated in the code.

Bug: 137350495
Test: m
Change-Id: I5aa29a49b193db47aaee4d3a756c17f48cc9f0b1
Merged-In: I5aa29a49b193db47aaee4d3a756c17f48cc9f0b1
2019-11-08 16:17:13 +00:00
satayev
698c84738e Merge "Plumb @TestApi enforcement policy to runtime." am: eb6be3bd48
am: d24444e5ee

Change-Id: If7541ac35b6535a6d5535f777e840aa3da90fa69
2019-11-06 07:13:47 -08:00
satayev
d24444e5ee Merge "Plumb @TestApi enforcement policy to runtime."
am: eb6be3bd48

Change-Id: If061e7da58ffc566cd054e90ad26bdfa0d8f6e30
2019-11-06 07:06:56 -08:00
Artur Satayev
19305b4f0e Plumb @TestApi enforcement policy to runtime.
By default access to test APIs would be allowed for instrumented processes only.

Bug: 133832325
Test: manual
Change-Id: Iaaa54a3fe04624a7b5b9f4304d39fc37580568c8
2019-11-05 18:08:44 +00:00
TreeHugger Robot
abc015499a Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master 2019-10-31 18:38:40 +00:00
Andrei-Valentin Onea
97ad6f5c48 Merge "Add apis for listing all compat changes" am: 2c3b1a1010
am: 4b8947bd56

Change-Id: I924c55f20755d33c6a748326bf07083592fd77e6
2019-10-31 06:52:54 -07:00
Andrei Onea
18041f787d Add apis for listing all compat changes
These apis are required for adding UI in the Developer options for
modifying compatibility change overrides.

Bug: 138280620
Test: atest CompatConfigTest
Change-Id: If55aa68f9bdd6bed0765324e972de3683bacb553
2019-10-31 11:54:13 +00:00
Xin Li
6f48900f50 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
Bug: 142003500
Change-Id: If5056a73ede668b0048ca107b686413695e5b3b6
2019-10-30 14:33:01 -07:00
Xin Li
b2198fa670 Merge "Merge Coral/Flame into AOSP master" 2019-10-27 04:44:29 +00:00
Mathieu Chartier
fca111db2f Merge "Avoid preloading classes for boot image profiling" am: cfee28589b am: 84f358f9bf
am: ac60bbb740

Change-Id: I48fa3fbc8b9f2859a084bf36d06117a1ea8970cf
2019-10-25 13:20:46 -07:00
Mathieu Chartier
ac60bbb740 Merge "Avoid preloading classes for boot image profiling" am: cfee28589b
am: 84f358f9bf

Change-Id: Iea9cf99e07272a4e5a6ae132825591d3508a5c04
2019-10-25 13:08:35 -07:00
Mathieu Chartier
84f358f9bf Merge "Avoid preloading classes for boot image profiling"
am: cfee28589b

Change-Id: I9c7be76f96546d50a6e049aeab60ca71ee215500
2019-10-25 12:58:29 -07:00
Mathieu Chartier
cfee28589b Merge "Avoid preloading classes for boot image profiling" 2019-10-25 19:35:00 +00:00
Mathieu Chartier
d3c72db3bb Avoid preloading classes for boot image profiling
Since the clinits may execute methods, we should avoid preloading
classes to avoid executing methods that may not be required. These
samples could cause inaccuracy in the boot image profile.

Test: manual: adb logcat | grep preloadClasses
Bug: 139883463

Change-Id: I5b4568a477724606105196cba010109f80eecec1
2019-10-24 08:04:31 -07:00
Matt Pietal
a17cb6e167 Merge "Resolver: Modernize layout" into qt-qpr1-dev
am: 15b780d108

Change-Id: I5aea7ba6f4f950d7857cc99d38a44ad329fb9088
2019-10-24 06:18:51 -07:00
Anna Trostanetski
96d504dc03 Merge "Add userId to the package name API." am: dcc401b7b7 am: 443d3d0f11
am: ba20c10d2c

Change-Id: I6584c26c2c9df0a778d6d34fd122d096781cca38
2019-10-24 06:12:32 -07:00
Anna Trostanetski
ba20c10d2c Merge "Add userId to the package name API." am: dcc401b7b7
am: 443d3d0f11

Change-Id: I034b22fff0c4510d604cee8c5a353994b3c097e3
2019-10-24 06:00:51 -07:00