Commit Graph

368976 Commits

Author SHA1 Message Date
Jeff Sharkey
3eef28d461 Merge changes from topic "back111085900" into pi-dev
* changes:
  DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete.
  DO NOT MERGE. Execute "strict" queries with extra parentheses.
2018-08-10 17:26:54 +00:00
TreeHugger Robot
1f91ee3885 Merge "Pinner: Don't pin apps for work profile." into pi-dev 2018-08-10 17:18:36 +00:00
Michal Karpinski
dfba41947b Merge "DO NOT MERGE Log various information about non-foreground activity starts" into pi-dev 2018-08-10 08:32:57 +00:00
Carmen Jackson
0ff9946abe Pinner: Don't pin apps for work profile.
Since the Home and Camera intents aren't set to relevant apps for the
work profile, we don't want to pin those. However, the pinner will
trigger on boot for the work profile, after the primary profile has
pinned, and clear the currently pinned apps to try to pin the work
profile apps. This change skips rerunning the pinner for the work
profile.

Bug: 112357464
Test: Added logging and tested device with a work profile. After reboot,
saw that the apps for the primary profile are pinned and the ones for
the work profile are not. Previously, apps for the work profile were
attempted to be pinned.
Change-Id: I0a7fdeab4287dcb6765c0fb47647ddc36db405b6
2018-08-09 15:18:55 -07:00
TreeHugger Robot
2df4d93b01 Merge "Clarify WebViewClient.shouldOverrideUrlLoading docs" into pi-dev 2018-08-09 22:03:33 +00:00
Howard Ro
4db243a3db Add a logging for ACTION_BAN_APP_NOTES
Bug: 111215354
Test: adb logcat -b events
Change-Id: I4e26adac7a7ad5053b919605b8a25e18bd93cac7
Merged-In: I4e26adac7a7ad5053b919605b8a25e18bd93cac7
2018-08-09 20:50:03 +00:00
Michal Karpinski
3eab951217 DO NOT MERGE Log various information about non-foreground activity starts
Logging activity starts to TRON, but only if the caller app
doesn't have any foreground activity present.

Example event:
08-03 15:21:30.813  1231  3220 I sysui_multi_action: [757,1513,758,4,805,1533306090812,1514,10147,1515,com.google.android.talk,1516,1018,1517,0,1518,1000,1519,1000,1520,0,1521,10147,1522,com.google.android.talk,1523,1018,1524,0,1525,pendingintent:u0a12:com.google.android.talk/com.google.android.apps.hangouts.phone.ConversationActivity,1526,com.google.android.talk/com.google.android.apps.hangouts.phone.BabelHomeActivity,1527,1,1528,com.google.android.apps.hangouts.phone.conversationlist,1540,1,1541,com.google.android.apps.hangouts.phone.BabelHomeActivity,1542,3146240,1543,{com.google.android.talk/com.google.android.apps.hangouts.phone.BabelHomeActivity},1544,com.google.android.talk/com.google.android.apps.hangouts.phone.BabelHomeActivity,1545,com.google.android.talk,1546,1,1547,0,1551,0,1552,0]

(cherry-picked from 201bc0c14e)

Bug: b/111866309
Context: go/activity-starts-logging-tron
Test: 1) enable logging with: adb shell settings put global activity_starts_logging_enabled 1
      2) open some activities and observe: adb logcat -b events | grep "sysui_multi_action: \[757,1513"
Test: atest FrameworksServicesTests:ActivityStarterTests

Change-Id: Ie7dee51c574e544d12e83d279afda46b336f2013
2018-08-09 15:18:07 +01:00
Jeff Sharkey
5c7dd60026 [automerger skipped] DO NOT MERGE. Persistable Uri grants still require permissions. am: 05519b7e3d am: 1e4d88926f
am: 130a2041e7  -s ours

Change-Id: I71aecf8896fc494a75bd222e8c146ebce3654d53
2018-08-08 18:15:26 -07:00
Jeff Sharkey
130a2041e7 DO NOT MERGE. Persistable Uri grants still require permissions. am: 05519b7e3d
am: 1e4d88926f

Change-Id: I267a65ad3c2e73b697f832059567f4f2c2438792
2018-08-08 17:53:03 -07:00
Jeff Sharkey
1e4d88926f DO NOT MERGE. Persistable Uri grants still require permissions.
am: 05519b7e3d

Change-Id: I6d42f089fec6c268b35885d3169644853ab734c5
2018-08-08 17:23:00 -07:00
Jeff Sharkey
71b35bcedd Merge "DO NOT MERGE. Persistable Uri grants still require permissions." into pi-dev 2018-08-09 00:06:30 +00:00
Paul Miller
f2043b4af5 Clarify WebViewClient.shouldOverrideUrlLoading docs
Call out more explicitly the antipattern of calling loadUrl with the
same URL and returning true, and repeat this on the deprecated version.
Simplify the wording about returning true v.s. false. Switch to the
"note" style used elsewhere on the page.

BUG:111843379
Change-Id: I36c31a8e0f4754c314b8a4d72cc497c9c3a3e242
Test: make docs
(cherry picked from commit 3819a6467b)
2018-08-08 21:56:31 +00:00
TreeHugger Robot
fd24585182 Merge "Fix to mark disableApkUnlessMatchedSku hidden for all users" into pi-dev 2018-08-08 00:04:41 +00:00
Jeff Sharkey
d6a6e7127c DO NOT MERGE. Persistable Uri grants still require permissions.
When FLAG_GRANT_PERSISTABLE_URI_PERMISSION is requested, we still
need to check permissions between the source and target packages,
instead of shortcutting past them.

The spirit of the original change is remains intact: if the caller
requested FLAG_GRANT_PERSISTABLE_URI_PERMISSION, then we avoid
returning "-1", which would prevent the grant data structure from
being allocated.

Bug: 111934948
Test: atest android.appsecurity.cts.AppSecurityTests
Change-Id: Ief0fc922aa09fc3d9bb6a126c2ff5855347cd030
Merged-In: Ief0fc922aa09fc3d9bb6a126c2ff5855347cd030
2018-08-07 22:26:00 +00:00
Jeff Sharkey
05519b7e3d DO NOT MERGE. Persistable Uri grants still require permissions.
When FLAG_GRANT_PERSISTABLE_URI_PERMISSION is requested, we still
need to check permissions between the source and target packages,
instead of shortcutting past them.

The spirit of the original change is remains intact: if the caller
requested FLAG_GRANT_PERSISTABLE_URI_PERMISSION, then we avoid
returning "-1", which would prevent the grant data structure from
being allocated.

Bug: 111934948
Test: atest android.appsecurity.cts.AppSecurityTests
Change-Id: Ief0fc922aa09fc3d9bb6a126c2ff5855347cd030
Merged-In: Ief0fc922aa09fc3d9bb6a126c2ff5855347cd030
2018-08-07 22:25:13 +00:00
Ruchi Kandoi
a04c80089d Fix to mark disableApkUnlessMatchedSku hidden for all users
Bug: 111795497
Test: manual; switch to guest & secondary user
Change-Id: I8ba64f52953b8a86adaea343ed52eaa6865a0019
2018-08-07 14:49:46 -07:00
Andrew Solovay
97229ed3e8 Merge "docs: Adding links to "about version" pages" into pi-dev 2018-08-07 18:49:47 +00:00
TreeHugger Robot
8f938095b4 Merge "wifi.proto: Add metric for installed passpoint profile type" into pi-dev 2018-08-07 18:20:16 +00:00
Andrew Solovay
a861ff7a64 docs: Adding links to "about version" pages
For the various Build.VERSION_CODES.<version_name> constants, adding
a link to the appropriate "about this release" page in
/about/versions/ , if there is one.

Staged doc to:
http://go/dac-stage/reference/android/os/Build.VERSION_CODES

Bug: 80546406
Test: make ds-docs
Change-Id: If363445c938d325172da6beeed25e821121c5539
2018-08-06 16:13:10 -07:00
Hall Liu
4deb593808 Merge "Don't insert certain numbers into the call log" into pi-dev 2018-08-06 22:57:35 +00:00
Hall Liu
e6e6ec4849 Don't insert certain numbers into the call log
For regulatory requirements, prevent certain sensitive numbers from
being logged in the call log. The numbers can either be specified in the
carrier config or in the mcc config for the device.

Bug: 111470439
Test: unit, manual
Change-Id: Icc4db12def802c2ce5485422a0ec199e3e7452fa
2018-08-06 11:33:46 -07:00
TreeHugger Robot
a7a496f3a1 Merge "No disclaimer when switching profile for system SMS and dialer apps." into pi-dev 2018-08-06 17:25:48 +00:00
Eino-Ville Talvala
e85115fdb7 Merge "Camera: Documentation updates for calibration and distortion correction" into pi-dev 2018-08-04 23:06:05 +00:00
Jeff Sharkey
506994268b DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete.
Developers often accept selection clauses from untrusted code, and
SQLiteQueryBuilder already supports a "strict" mode to help catch
SQL injection attacks.  This change extends the builder to support
update() and delete() calls, so that we can help secure those
selection clauses too.

Bug: 111085900
Test: atest packages/providers/DownloadProvider/tests/
Test: atest cts/tests/app/src/android/app/cts/DownloadManagerTest.java
Test: atest cts/tests/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java
Change-Id: Ib4fc8400f184755ee7e971ab5f2095186341730c
Merged-In: Ib4fc8400f184755ee7e971ab5f2095186341730c
2018-08-03 13:43:44 -06:00
Jeff Sharkey
57b04a8680 DO NOT MERGE. Execute "strict" queries with extra parentheses.
SQLiteQueryBuilder has a setStrict() mode which can be used to
detect SQL attacks from untrusted sources, which it does by running
each query twice: once with an extra set of parentheses, and if that
succeeds, it runs the original query verbatim.

This sadly doesn't catch inputs of the type "1=1) OR (1=1", which
creates valid statements for both tests above, but the final executed
query ends up leaking data due to SQLite operator precedence.

Instead, we need to continue compiling both variants, but we need
to execute the query with the additional parentheses to ensure
data won't be leaked.

Test: atest cts/tests/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java
Bug: 111085900
Change-Id: I6e8746fa48f9de13adae37d2990de11c9c585381
Merged-In: I6e8746fa48f9de13adae37d2990de11c9c585381
2018-08-03 13:43:40 -06:00
TreeHugger Robot
f8f459a2cc Merge "Do not restart tethering while enabling tethering." into pi-dev 2018-08-02 22:36:10 +00:00
Eino-Ville Talvala
08bd163e2d Camera: Documentation updates for calibration and distortion correction
- Add more notes on coordinate axes
- Add more text on metadata when distortion correction is active
- Note that poseTranslation needs to be negated in many use cases
- Fix coordinate system references for OIS reporting, add more information
- Note that pixel centers at half-integers for the camera API metadata
  such as lens intrinsics

Bug: 79371566
Bug: 74434422
Bug: 109742048
Bug: 109834325
Bug: 109817371
Bug: 112107924
Test: Manual reading of added text
Change-Id: I450e80b79ef66ce8d82a4dee835db6abd1e598a3
2018-08-02 14:43:44 -07:00
arangelov
64439c1e8c No disclaimer when switching profile for system SMS and dialer apps.
This CL prevents the Toast message from showing when the following
conditions are met:
1. App is system app
2. Intent action is either ACTION_DIAL or ACTION_CALL or if it is
ACTION_SENDTO, only skip if data scheme is one of "sms:", "smsto:",
"mms:" or "mmsto:".

Bug: 111228250
Test: atest FrameworksCoreTests:IntentForwarderActivityTest
Change-Id: Idef71ff2928e9e3d72bad4ba8ff17f9306e91d25
2018-08-02 14:52:30 +01:00
TreeHugger Robot
9d80381ad8 Merge "Set initial KSV state after inflation" into pi-dev 2018-08-01 23:19:52 +00:00
Amin Shaikh
d967f8210c Do not restart tethering while enabling tethering.
Change-Id: I64194cfbcf830d867593681ab960fea0213ef24a
Fixes: 110303540
Test: manual
(cherry picked from commit aa4735f69c)
2018-08-01 22:41:00 +00:00
Laura Davis
ae3f656146 Merge "Docs: fixed typo and made minor edits" into pi-dev 2018-08-01 17:47:04 +00:00
Laura Davis
63e36667da Merge "Docs: fixed typo" into pi-dev 2018-08-01 17:46:37 +00:00
Ecco Park
2ea8e0b31f wifi.proto: Add metric for installed passpoint profile type
Bug: 111473296
Test: Unit Tests

Merged-In: Ia6c6641697ecea1a51d7931d5f0f5b25963ae198
Change-Id: Ia6c6641697ecea1a51d7931d5f0f5b25963ae198
Signed-off-by: Ecco Park <eccopark@google.com>
2018-07-31 13:56:40 -07:00
Laura Davis
e27c3511d8 Docs: fixed typo and made minor edits
Test: make ds-docs

Bug: 111734031
Bug: 111734470
Change-Id: Ic120368fef0c0673ce954cdf0927a4705b3edcd2
2018-07-30 14:56:32 -07:00
TreeHugger Robot
614e26dbcb Merge "Work profile without password shouldn't be locked." into pi-dev 2018-07-30 17:16:20 +00:00
Bill Yi
69556e89f3 Merge changes from topic "am-c65d7988-0ca0-4757-9d9c-21f4575eec01" into oc-dev am: 515700b4fe am: c93b474752
am: b9504e591a

Change-Id: I2b24a15f259b6c587e9bfc4fa01b4a8aa888f75a
2018-07-29 23:32:29 -07:00
Bill Yi
f5940ac528 [automerger skipped] Import translations. DO NOT MERGE skipped: 1c484c5d96 skipped: b71941c9bb am: 976bb372c3 -s ours am: 27c3ba01ff -s ours
am: ff99070f78  -s ours

Change-Id: I52d966e5fe7a7e6d0c3ee6c0df4d424c0d7f59ff
2018-07-29 23:24:16 -07:00
Bill Yi
b9504e591a Merge changes from topic "am-c65d7988-0ca0-4757-9d9c-21f4575eec01" into oc-dev am: 515700b4fe
am: c93b474752

Change-Id: I94c7b1d7e9bda726390fc5ceba62f8286a06bc42
2018-07-29 23:04:31 -07:00
Bill Yi
105d24717f Merge changes from topic "am-1155d171-2145-4903-8420-80ecfd6c6b08" into oc-dev am: d0025407df am: 0834c94a93
am: ab2d9d3e37

Change-Id: Ib76a04e7bab429bbdcfee69bb0240feaf154d1d2
2018-07-29 22:59:05 -07:00
Bill Yi
ff99070f78 [automerger skipped] Import translations. DO NOT MERGE skipped: 1c484c5d96 skipped: b71941c9bb am: 976bb372c3 -s ours
am: 27c3ba01ff  -s ours

Change-Id: Id3d12a61dbf1a9e7eeabf1c12c39b8aa43ffe52b
2018-07-29 22:58:06 -07:00
Bill Yi
424d01398b [automerger skipped] Import translations. DO NOT MERGE skipped: f9a5e160d0 skipped: eff2a7b637 am: 70ebabc63d -s ours am: 786ae0d322 -s ours
am: 3b822cd077  -s ours

Change-Id: I50130dce613f0c7e4a596ea9dcde87de43d02fc6
2018-07-29 22:51:02 -07:00
Bill Yi
ab2d9d3e37 Merge changes from topic "am-1155d171-2145-4903-8420-80ecfd6c6b08" into oc-dev am: d0025407df
am: 0834c94a93

Change-Id: I82eb8a2dfab9d3ce1d7b8de91950d9c2069da2db
2018-07-29 22:46:54 -07:00
Bill Yi
c93b474752 Merge changes from topic "am-c65d7988-0ca0-4757-9d9c-21f4575eec01" into oc-dev
am: 515700b4fe

Change-Id: I0f58a9fe2bb437e8caf854b4ca8f5c4bc0f10c7d
2018-07-29 22:43:33 -07:00
Bill Yi
27c3ba01ff [automerger skipped] Import translations. DO NOT MERGE skipped: 1c484c5d96 skipped: b71941c9bb
am: 976bb372c3  -s ours

Change-Id: I971275a90e048fec4861d2e866ec53c5d1b0a356
2018-07-29 22:41:40 -07:00
Bill Yi
3b822cd077 [automerger skipped] Import translations. DO NOT MERGE skipped: f9a5e160d0 skipped: eff2a7b637 am: 70ebabc63d -s ours
am: 786ae0d322  -s ours

Change-Id: I1a741c23da3317c1b711a1a58cbf23bc4e97837e
2018-07-29 22:40:28 -07:00
Bill Yi
dce81b39c7 [automerger skipped] Import translations. DO NOT MERGE skipped: 4c781e19f5 skipped: b3e44fae1f am: 843fb76d1f -s ours am: ffe456e49c -s ours
am: acdedf3122  -s ours

Change-Id: I61f0ab91a21552f0dc61c7173a971aa07bef88aa
2018-07-29 22:22:52 -07:00
Bill Yi
acdedf3122 [automerger skipped] Import translations. DO NOT MERGE skipped: 4c781e19f5 skipped: b3e44fae1f am: 843fb76d1f -s ours
am: ffe456e49c  -s ours

Change-Id: Ifc2aceed944b28d1a9d923f01eb92ab374d67d6b
2018-07-29 22:19:49 -07:00
Bill Yi
0834c94a93 Merge changes from topic "am-1155d171-2145-4903-8420-80ecfd6c6b08" into oc-dev
am: d0025407df

Change-Id: I7186be0877b4649e3246a05ea610c7c5ee75e542
2018-07-29 22:18:03 -07:00
Bill Yi
786ae0d322 [automerger skipped] Import translations. DO NOT MERGE skipped: f9a5e160d0 skipped: eff2a7b637
am: 70ebabc63d  -s ours

Change-Id: I06839e68100abc88459588a4fec9ef4e04f65c08
2018-07-29 22:15:41 -07:00
TreeHugger Robot
515700b4fe Merge changes from topic "am-c65d7988-0ca0-4757-9d9c-21f4575eec01" into oc-dev
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 1c484c5d96 skipped: b71941c9bb
  [automerger skipped] Import translations. DO NOT MERGE skipped: 1c484c5d96
  Import translations. DO NOT MERGE
2018-07-30 05:14:30 +00:00