Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
458,587 Commits 3 Branches 0 Tags
b848a1017c82e30defb6b23005ef123dab19a4fe
Commit Graph

99624 Commits

Author SHA1 Message Date
Kholoud Mohamed
b848a1017c Merge "Add default cross-profile package APIs" 2020-01-07 11:29:09 +00:00
Kholoud Mohamed
ae9545e102 Merge "Add INTERACT_ACROSS_PROFILES appop" 2020-01-07 11:28:18 +00:00
Automerger Merge Worker
8303c9def2 Merge "Change NetworkTimeUpdateServiceImpl behavior" am: 48247d9223 am: f11a45b756 am: ef100e45fe 
Change-Id: Ie4ab2ecaa0778fa6ff7d75e5677dfb4bed1d443d
 2020-01-07 10:45:04 +00:00
Automerger Merge Worker
ef100e45fe Merge "Change NetworkTimeUpdateServiceImpl behavior" am: 48247d9223 am: f11a45b756 
Change-Id: Ie3b6457ba196f7aa00ffb6e2fa77e5acbb926374
 2020-01-07 10:30:35 +00:00
Neil Fuller
f11a45b756 Merge "Change NetworkTimeUpdateServiceImpl behavior" 
am: 48247d9223

Change-Id: I299a69b5a3abf5da66237f79aa7ca56b6268452a
 2020-01-07 02:14:01 -08:00
Neil Fuller
48247d9223 Merge "Change NetworkTimeUpdateServiceImpl behavior" 2020-01-07 10:07:08 +00:00
Automerger Merge Worker
c82d176593 Merge "Change tetheroffloadjni to tetheringutilsjni" am: 3e16a10a3e am: 75b0369615 am: ef581020d3 
Change-Id: I2069561edb05b53e565563c8419c689531ff9571
 2020-01-07 09:38:44 +00:00
Automerger Merge Worker
ef581020d3 Merge "Change tetheroffloadjni to tetheringutilsjni" am: 3e16a10a3e am: 75b0369615 
Change-Id: I913f33213bf208ef7733871222e57a21f0d460e6
 2020-01-07 09:25:49 +00:00
markchien
75b0369615 Merge "Change tetheroffloadjni to tetheringutilsjni" 
am: 3e16a10a3e

Change-Id: I48207d95cf6f512ec038fb5dc9ba4009c01d676d
 2020-01-07 01:12:30 -08:00
Treehugger Robot
3e16a10a3e Merge "Change tetheroffloadjni to tetheringutilsjni" 2020-01-07 09:05:43 +00:00
Automerger Merge Worker
b8bf014c1f Merge "android.net: Update OWNERS." am: 2b89b0c7ca am: d913b9037a am: e2c143c1d8 
Change-Id: I0ada01aecdd91b47ebf3ac8561da0b6afaeaff3f
 2020-01-07 08:34:29 +00:00
Automerger Merge Worker
e2c143c1d8 Merge "android.net: Update OWNERS." am: 2b89b0c7ca am: d913b9037a 
Change-Id: Ie7b5b2fedba3f56e612b0951b27fbb5b12d98e97
 2020-01-07 08:21:36 +00:00
Tobias Thierer
d913b9037a Merge "android.net: Update OWNERS." 
am: 2b89b0c7ca

Change-Id: I77ffc427638cf6297da48cb83449d455f7b6d220
 2020-01-07 00:03:08 -08:00
TreeHugger Robot
fab33b6bf5 Merge "Use new UnsupportedAppUsage annotation." 2020-01-07 07:58:18 +00:00
markchien
771c3e9a3d Change tetheroffloadjni to tetheringutilsjni 
Rename tetheroffloadjni to tetheringutilsjni and move setupRaSocket
jni method from NetUtils into tetheringutilsjni.

Bug: 143195885
Test: -build, flash, boot
      -atest TetheringTests
      -Off/On hotspot with ipv6 upstream

Change-Id: Ib68eb6999bbe2d3ca97e68712f22b105311ef800
 2020-01-07 07:42:13 +00:00
Treehugger Robot
2b89b0c7ca Merge "android.net: Update OWNERS." 2020-01-07 07:38:36 +00:00
Automerger Merge Worker
11d0a7fb46 Merge changes If28f0be6,If0f80067 am: 96529ad7fc am: cf77c50b11 am: 1740e8698d 
Change-Id: I826f1f94ea62eb5bd93e5d7edcbe278c8247ae2d
 2020-01-07 07:31:36 +00:00
Automerger Merge Worker
1740e8698d Merge changes If28f0be6,If0f80067 am: 96529ad7fc am: cf77c50b11 
Change-Id: I3d554c7ac0cf77aa2a80655d77c0e5bfb737dbdc
 2020-01-07 07:16:15 +00:00
Lorenzo Colitti
cf77c50b11 Merge changes If28f0be6,If0f80067 
am: 96529ad7fc

Change-Id: I108d3c36ce11af544ccfed9291dc38c690724915
 2020-01-06 23:03:04 -08:00
Lorenzo Colitti
96529ad7fc Merge changes If28f0be6,If0f80067 
* changes:
  Make LinkPropertiesTest pass, and fix an NPE.
  Add the DHCP server address to LinkProperties.
 2020-01-07 06:43:20 +00:00
Eino-Ville Talvala
0d2ba89d43 Merge "Camera: Add visual samples for android.scaler.cropRegion docs" 2020-01-07 06:25:42 +00:00
Lorenzo Colitti
348577e09f Make LinkPropertiesTest pass, and fix an NPE. 
aosp/973686 added the DHCP server address to LinkProperties, but
it did not have any tests, and would throw NPE when parceling a
LinkProperties that did not have a DHCP server.

Add tests and fix the bug.

Bug: 134098566
Test: unit test now passes
Change-Id: If28f0be650963e8d9af7eb53f6940824582a2db3
 2020-01-07 13:02:32 +09:00
Automerger Merge Worker
646bdf8e89 Merge "Convert some users of Time.format() to an alt." am: 267b83e7d6 am: 1b0c2fcd3b 
Change-Id: I1cb9722000898c9d1a7d479e9b0d88f717c57414
 2020-01-07 03:25:07 +00:00
Allen Su
1b0c2fcd3b Merge "Convert some users of Time.format() to an alt." 
am: 267b83e7d6

Change-Id: Ide4b3813fe9666259f4e94462f89c1683d2ba6ed
 2020-01-06 19:09:57 -08:00
Allen Su
267b83e7d6 Merge "Convert some users of Time.format() to an alt." 2020-01-07 02:28:15 +00:00
Jeffrey Huang
89e95d5b5f Merge changes I1510e44b,I9313299e,I7df5c644 
* changes:
  Update setBroadcastSubscriber
  Update activeConfigsChangedBroadcast
  Creating PendingIntentRef
 2020-01-07 02:18:22 +00:00
TreeHugger Robot
ae70e4d9d3 Merge "Parse empty component permissions as null" 2020-01-07 02:06:09 +00:00
Automerger Merge Worker
2d3c66da00 Merge "Clean up SmsApplication and expose getDefaultSmsPackage" am: 2ada7fbac2 am: b128b793c7 am: cccf7a2b84 
Change-Id: Id3b15d9d4d58235034405c85b7e10fc42f3e4172
 2020-01-07 01:12:52 +00:00
Automerger Merge Worker
cccf7a2b84 Merge "Clean up SmsApplication and expose getDefaultSmsPackage" am: 2ada7fbac2 am: b128b793c7 
Change-Id: Icee2c41d635883c6b9ede6bf6ec3bbfda22cdc1f
 2020-01-07 01:01:54 +00:00
Hall Liu
b128b793c7 Merge "Clean up SmsApplication and expose getDefaultSmsPackage" 
am: 2ada7fbac2

Change-Id: Ie4ca7c239295ba9e3bfb60815ca5c7d65bf0fdc1
 2020-01-06 16:45:17 -08:00
Hall Liu
2ada7fbac2 Merge "Clean up SmsApplication and expose getDefaultSmsPackage" 2020-01-07 00:36:51 +00:00
TreeHugger Robot
a6447f2832 Merge "Fix issue with letterboxing" 2020-01-07 00:29:30 +00:00
Jeffrey Huang
4f2e6bd68d Update setBroadcastSubscriber 
change #setBroadcastSubscriber and #unsetBroadcastSubscriber
to avoid using intentsender

Bug: 146074295
Test: Ran GTS Tests
Change-Id: I1510e44bcdf49b579fd49f51081c6a40618039fa
 2020-01-06 16:25:41 -08:00
Jeffrey Huang
47537a1c58 Update activeConfigsChangedBroadcast 
avoid using intentsender in #sendActiveConfigsChangedBroadcast
and #removeActiveConfigsChangedBroadcast.

Bug: 146074295
Test: Ran GTS Tests
Change-Id: I9313299ea0bc89f092b1c62fbfc34e06a127eaa9
 2020-01-06 16:25:41 -08:00
Jeffrey Huang
ad21374842 Creating PendingIntentRef 
Update #setDataFetchOperation to avoid using intentsender.

Bug: 146074295
Test: Ran GTS Tests
Change-Id: I7df5c6441725aa4e46fac18925664c9455f50fb9
 2020-01-06 16:25:41 -08:00
Winson Chiu
b07e14152b Merge "Test InstantAppResolverService method fallback" 2020-01-07 00:20:51 +00:00
Eino-Ville Talvala
d2d749afd2 Camera: Add visual samples for android.scaler.cropRegion docs 
To better document the cropping specification for camera2, add diagrams
from source.android.com into the reference docs as well.

Test: Docs build, look correct

Change-Id: I18a9c3801e19f39164f0d8c19c0cc001f142024f
 2020-01-06 16:10:29 -08:00
Automerger Merge Worker
3db9e958ab Merge "Create new APIs for overriding APNs" am: 13beb87783 am: 4d1771a3fb 
Change-Id: I202aa723edabdca84eddb679233ac0dcf6cfacd2
 2020-01-07 00:10:24 +00:00
Hall Liu
4d1771a3fb Merge "Create new APIs for overriding APNs" 
am: 13beb87783

Change-Id: I523c37c06cb7636775131720c252f06cb2eb152f
 2020-01-06 16:02:13 -08:00
Winson
7ef452c6dc Parse empty component permissions as null 
An empty string is a valid value, and must be converted to null so
that the permission check is skipped.

Bug: 146596667

Test: manual verify failure using APK from bug, success after fix

Change-Id: Ia5cc915124a6ecb7ec6a9c907b5f2afed98cd44e
 2020-01-06 16:00:37 -08:00
Hall Liu
13beb87783 Merge "Create new APIs for overriding APNs" 2020-01-06 23:14:44 +00:00
Jorim Jaggi
0dd0cf911b Fix issue with letterboxing 
- Only consider client state if new API is actually turned on.
- We only sent the state the client was actually controlling.
However, we then later check for visibility for state that may not
even exist. Thus, we keep the state but only update the sources
the client is actually controlling.
- Initialize source with default visibility. This prevents
issues where the source may not exist but we still check it.

This fixes issues where a letterbox was accidentally placed on
screen because WM was thinking client requested fullscreen flag
(hiding the status bar), and other places where we checked
requested visibility.

Also renamed client state to requested state.

Test: Open any app, open IME
Bug: 111084606
Change-Id: Ibead561fc5593d8944400320f5e31dbe262612fe
 2020-01-06 23:50:39 +01:00
Songchun Fan
70d860e333 Merge "Make Context.ACTION_LOAD_DATA a system API" 2020-01-06 21:53:06 +00:00
Automerger Merge Worker
070e602547 Merge "Add new permissions" am: 62ace8c46a am: c0f9b27214 am: ec776dfda9 
Change-Id: I8193a10bef4d829f41fd2609b571c9fa52365783
 2020-01-06 21:35:59 +00:00
Automerger Merge Worker
ec776dfda9 Merge "Add new permissions" am: 62ace8c46a am: c0f9b27214 
Change-Id: I2114c613729f0d84d773b7e8b58402cda302a8c8
 2020-01-06 21:20:53 +00:00
Jing Ji
4b2d16d2b1 Merge "Skip meminfo item for the gone processes" 2020-01-06 21:16:42 +00:00
Neil Fuller
c0f9b27214 Merge "Add new permissions" 
am: 62ace8c46a

Change-Id: I618e2f4a608914d1bf679186880cd358a75a238d
 2020-01-06 13:02:34 -08:00
TreeHugger Robot
8666b89c84 Merge "Move Slice into Dataset." 2020-01-06 19:50:55 +00:00
Neil Fuller
62ace8c46a Merge "Add new permissions" 2020-01-06 19:38:25 +00:00
Chen Xu
03f00fc5c3 Merge "support data migration from OEM legacy app to mainline" 2020-01-06 19:05:49 +00:00