Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
365,813 Commits 3 Branches 0 Tags
9472db8d0d180de780b6641ba4e027e5c560b6bf
Commit Graph

81552 Commits

Author SHA1 Message Date
Julia Reynolds
9472db8d0d Merge changes I3e542532,Id8f2147f into pi-dev 
am: 68256e09d9

Change-Id: Iffa80c2254d25336d52c0f502b4c050c9c448581
 2018-03-30 10:54:11 +00:00
Bo Zhu
b7a004d6a7 Merge "Minor correction to the javadoc to match implementation" into pi-dev 
am: 3cda0f2989

Change-Id: I74097793f02cf97d0e61961d01df3c96fcbefb58
 2018-03-30 10:48:36 +00:00
Jeff Sharkey
b407389280 Merge "Handle public volumes and otherwise invalid UUIDs." into pi-dev 
am: ee1661f7cd

Change-Id: Ibaed0d6289ce9312f2acc2701cea9cee90740492
 2018-03-30 10:31:32 +00:00
Dmitry Dementyev
83a1330718 Merge "Add support for testing mode root certificate." into pi-dev 
am: 2d3e4b7437

Change-Id: I24ac397b82ec0ce0913f4aa9c8bad9481ed5a970
 2018-03-30 10:26:18 +00:00
Lorenzo Colitti
f04afa2537 Merge "Mark networks with OEM_PAID always restricted" am: 8e338f7dae 
am: b9cce46ba8

Change-Id: I88500f6add4f1a6c8a77eb976a489c11c7dc5b6d
 2018-03-30 09:05:09 +00:00
Chalard Jean
e3ddf3b53d Merge "Clarify documentation for getActiveNetworkInfo and friends" am: 39d6694208 
am: 3621eb75cb

Change-Id: I339bb71182723907ed078e8be739c4d4ea2d1da5
 2018-03-30 08:51:38 +00:00
Lorenzo Colitti
b9cce46ba8 Merge "Mark networks with OEM_PAID always restricted" 
am: 8e338f7dae

Change-Id: I4ffcf01e1f79c8a3570ea2b819688b55904939fe
 2018-03-30 08:47:25 +00:00
Chalard Jean
3621eb75cb Merge "Clarify documentation for getActiveNetworkInfo and friends" 
am: 39d6694208

Change-Id: I167776fb6ec44aff4b35b58378b54e3b55907427
 2018-03-30 08:36:58 +00:00
Lorenzo Colitti
8c39b22dd5 Merge "Disallow Reserved SPI Allocation" am: 7fcde83572 
am: 62e6b774e3

Change-Id: Ic5c7857754a04ae7238414b55a1e5ab653d62f6b
 2018-03-30 08:33:06 +00:00
Lorenzo Colitti
968a0172dc Merge "Require explicitly supplied truncation length" am: 0dde066ef7 
am: 2749432646

Change-Id: I347bfd43be54d162dea831770ab08d792ea1443f
 2018-03-30 07:45:04 +00:00
Lorenzo Colitti
62e6b774e3 Merge "Disallow Reserved SPI Allocation" 
am: 7fcde83572

Change-Id: Idd387dfad8d8886fad28005f9001a732a73cae1b
 2018-03-30 07:39:01 +00:00
Lorenzo Colitti
8e338f7dae Merge "Mark networks with OEM_PAID always restricted" 2018-03-30 07:00:54 +00:00
Pavel Maltsev
4af9107d6c Mark networks with OEM_PAID always restricted 
Bug: 68762530
Exempt-From-Owner-Approval: OWNERS have approved, but gerrit doesn't see it
Test: runtest -x frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest
Change-Id: Ieadef7c42634d890281543226203530fb18eb0a3
 2018-03-30 07:00:39 +00:00
Lorenzo Colitti
2749432646 Merge "Require explicitly supplied truncation length" 
am: 0dde066ef7

Change-Id: I20f7f910f4f0369e38eebd0b7fe6970331763e85
 2018-03-30 06:48:22 +00:00
Lorenzo Colitti
93f325276f Merge "Clarify UDP encapsulation socket API" am: 2891409c93 
am: a12c8fe218

Change-Id: I5fcf79691c670e710e46b3a9eac8a580c44028fb
 2018-03-30 06:48:17 +00:00
Chalard Jean
39d6694208 Merge "Clarify documentation for getActiveNetworkInfo and friends" 2018-03-30 06:37:22 +00:00
Lorenzo Colitti
a12c8fe218 Merge "Clarify UDP encapsulation socket API" 
am: 2891409c93

Change-Id: Ie1e7ea81440afee2618211d989989cf5daff3e1e
 2018-03-30 06:35:22 +00:00
Lorenzo Colitti
7fcde83572 Merge "Disallow Reserved SPI Allocation" 2018-03-30 06:16:17 +00:00
Lorenzo Colitti
0dde066ef7 Merge "Require explicitly supplied truncation length" 2018-03-30 04:59:22 +00:00
Lorenzo Colitti
2891409c93 Merge "Clarify UDP encapsulation socket API" 2018-03-30 04:58:47 +00:00
Bookatz
d29a94a466 Merge "Dummy WorkChain class" 
am: 81270b1885

Change-Id: Id8caf73e4dcb0b230cd57fe485c2768decf1d8eb
 2018-03-30 01:32:57 +00:00
Treehugger Robot
81270b1885 Merge "Dummy WorkChain class" 2018-03-30 00:17:37 +00:00
TreeHugger Robot
68256e09d9 Merge changes I3e542532,Id8f2147f into pi-dev 
* changes:
  Update notification blocking documentation.
  Wait before computing contact affinity
 2018-03-30 00:10:22 +00:00
Bo Zhu
3cda0f2989 Merge "Minor correction to the javadoc to match implementation" into pi-dev 2018-03-30 00:04:46 +00:00
Benedict Wong
dab50eecfd Merge "Add documentation for TCP interactions with transforms" into pi-dev 2018-03-30 00:01:43 +00:00
Felipe Leme
74a95763db Merge "Minor javadoc fixes." into pi-dev 
am: 46e83ebf27

Change-Id: Ibcd6d4e610b714fd042f8bc3389904527482dae1
 2018-03-29 23:56:35 +00:00
Bo Zhu
ba94b9ab00 Minor correction to the javadoc to match implementation 
Change the number of bytes for the length prefix for salted hash to be
4-byte instead of 1-byte

Bug: 77294103
Test: None
Change-Id: Ifa2739c757539e9b7d2aaa1ea702de0148a311ba
 2018-03-29 16:42:29 -07:00
TreeHugger Robot
ee1661f7cd Merge "Handle public volumes and otherwise invalid UUIDs." into pi-dev 2018-03-29 23:33:18 +00:00
yuemingw
c915a909b7 Merge "Allow PO to call setSystemSetting." into pi-dev 
am: 04446f9f68

Change-Id: Ib0fe1542e76c862a5b6c1f7652dd5d5ded29b122
 2018-03-29 23:32:18 +00:00
Dmitry Dementyev
2d3e4b7437 Merge "Add support for testing mode root certificate." into pi-dev 2018-03-29 23:25:14 +00:00
TreeHugger Robot
46e83ebf27 Merge "Minor javadoc fixes." into pi-dev 2018-03-29 23:11:32 +00:00
Mihai Popa
af5d27b174 Merge "[Magnifier-37] Hide handle when overlaps magnifier" into pi-dev 
am: 3708933872

Change-Id: I9b8cfebb79d9a886b502bc1057716c3b20b3d7f3
 2018-03-29 23:06:57 +00:00
Jeff Sharkey
70c93a28e0 Merge "Only return internal path when not visible." into pi-dev 
am: 2254fe2e04

Change-Id: I7e90be19432f3ac8e0ec9b878f31416dca6c1e4a
 2018-03-29 23:03:26 +00:00
Felipe Leme
e4c2d3c5ce Merge "Fixed annotation typo." into pi-dev 
am: 74896e21a7

Change-Id: I6baeb8014228b9faba0be901935b6dd25e7cd9fd
 2018-03-29 22:56:05 +00:00
TreeHugger Robot
04446f9f68 Merge "Allow PO to call setSystemSetting." into pi-dev 2018-03-29 22:24:25 +00:00
Mady Mellor
fc124567dd Merge "Add permission hint, update permission slice structure" into pi-dev 
am: 92006c1764

Change-Id: I3c0a31b24fa9e37b5a5bee384578ac4ad2c4ed9f
 2018-03-29 22:22:51 +00:00
TreeHugger Robot
3708933872 Merge "[Magnifier-37] Hide handle when overlaps magnifier" into pi-dev 2018-03-29 22:16:58 +00:00
TreeHugger Robot
2254fe2e04 Merge "Only return internal path when not visible." into pi-dev 2018-03-29 22:16:32 +00:00
TreeHugger Robot
74896e21a7 Merge "Fixed annotation typo." into pi-dev 2018-03-29 21:43:14 +00:00
Bryan Mawhinney
ce30233913 Merge "Add a SystemApi to control display saturation." into pi-dev 
am: 49c27f2267

Change-Id: I426c85c95a4ececdb3ff3d88d3e6c3b6a68bcaf5
 2018-03-29 21:29:49 +00:00
TreeHugger Robot
92006c1764 Merge "Add permission hint, update permission slice structure" into pi-dev 2018-03-29 21:29:07 +00:00
Dmitry Dementyev
57ca3da24f Add support for testing mode root certificate. 
1) Add Certificate
2) Helper class for end-to-end tests
3) Only create snapshot for passwords with special prefix in test mode
4) Sync only keys with insecure prefix in test mode.

Bug: 76433465
Test: adb shell am instrument -w -e package
com.android.server.locksettings.recoverablekeystore
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: I6edc8c4716c3a034b6b79c7aa6f4b8478e9a3c9e
 2018-03-29 14:18:42 -07:00
Tomasz Wasilczyk
925804d844 Merge "Fix empty program list filter handling." into pi-dev 
am: 7a33063b39

Change-Id: I4f0a2a4914e71654c17ec7cb5fa6ec966d61d6a8
 2018-03-29 21:09:12 +00:00
TreeHugger Robot
49c27f2267 Merge "Add a SystemApi to control display saturation." into pi-dev 2018-03-29 20:55:22 +00:00
Julia Reynolds
8d2b053611 Update notification blocking documentation. 
Change-Id: I3e5425321d127fbf11adfa1c4ac5bed53fc73e03
Fixes: 73750866
Test: make
 2018-03-29 16:39:06 -04:00
Jeff Sharkey
18f325012d Handle public volumes and otherwise invalid UUIDs. 
Public volumes have short UUIDs (which aren't valid 128-bit UUIDs),
so we can't pass them around.  Even if they were valid UUIDs, we
don't handle clearing cached data on them, and they most likely
don't support fallocate(), so don't match them.

Test: manual
Bug: 74132243
Change-Id: Ib855eb869a86392e96ced94a9926c0b32b87e57e
 2018-03-29 14:29:29 -06:00
Tomasz Wasilczyk
7a33063b39 Merge "Fix empty program list filter handling." into pi-dev 2018-03-29 20:28:12 +00:00
yuemingw
c0281f10f5 Allow PO to call setSystemSetting. 
As system setting is per user, we should allow PO to call it.

Bug: 77204777
Test: runtest -x services/tests/servicestests/src/
com/android/server/devicepolicy/DevicePolicyManagerTest.java

Change-Id: I84152fa04adb441955b48b676be6e792134b52c2
 2018-03-29 20:23:52 +00:00
Jeff Sharkey
18bbed5865 Only return internal path when not visible. 
When a volume is visible (wrapped in sdcardfs), we need all file
operations to go through that sdcardfs layer to keep it in sync.

Test: manual
Bug: 73922090
Change-Id: I14f1f4743f470a6cbc78030e1ea8411f9910a5b9
 2018-03-29 14:20:50 -06:00
Mihai Popa
b1b423a46f [Magnifier-37] Hide handle when overlaps magnifier 
In most cases, the magnifier will be displayed above the current line,
so it will not overlap with the handle being dragged. However, when
there is not enough space in the current surface for the magnifier to be
displayed above the current line, the handle can overlap with the
magnifier. Since the handle is implemented as a different window, we
cannot really control the z ordering between them, and we noticed that
the handle will be rendered over the magnifier, which looks bad. This CL
better handles this situation, by hiding the handle when it would
overlap with the magnifier.

Bug: 76459199
Test: manual testing
Test: atest FrameworksCoreTests:android.widget.TextViewActivityTest
Test: atest FrameworksCoreTests:android.widget.TextViewTest
Change-Id: Id5a17fd964360df6094f9e2680e5bcca886c4d2d
 2018-03-29 20:04:49 +00:00