Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
420,550 Commits 3 Branches 0 Tags
236e61d618aeb3d2caa495c15568179d86206bf0
Commit Graph

420550 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chalard Jean
236e61d618 [automerger skipped] Merge "Let the system server have CONNECTIVITY_USE_RESTRICTED_NETWORKS." into qt-dev 
am: d0ee254855 -s ours
am skip reason: change_id I74cf5f0fa17fcf818f1fed78c7e3e4375c20152e with SHA1 506686bc3d is in history

Change-Id: I3ded47d5eb88d7e666f5444e3072556cb94b064b
 2019-05-28 07:50:53 -07:00
Aran Ink
f5f1802067 Merge "Tweak colors and spacing for GlobalActionsDialog." into qt-dev 
am: 0c5400eecc

Change-Id: If3eed0cbfb963393002e0c7af506039094e9509d
 2019-05-28 07:48:59 -07:00
TreeHugger Robot
d0ee254855 Merge "Let the system server have CONNECTIVITY_USE_RESTRICTED_NETWORKS." into qt-dev 2019-05-28 14:41:39 +00:00
Aran Ink
0c5400eecc Merge "Tweak colors and spacing for GlobalActionsDialog." into qt-dev 2019-05-28 14:24:38 +00:00
Fabian Kozynski
941aa80ba7 Merge "Fix Marquees in QSHeader animating when invisible" into qt-dev 
am: 4ec18d46f6

Change-Id: I214fe45663ff1c8972896f7c5be5c5e8c0a92e62
 2019-05-28 07:22:10 -07:00
TreeHugger Robot
4ec18d46f6 Merge "Fix Marquees in QSHeader animating when invisible" into qt-dev 2019-05-28 14:06:32 +00:00
Govinda Wasserman
071fdc6dba Merge "Removes obsolete alpha modifications" into qt-dev 
am: a96c11d043

Change-Id: I594debab9adbdd4e7ab69630d843b027ef41ca56
 2019-05-28 06:53:02 -07:00
TreeHugger Robot
a96c11d043 Merge "Removes obsolete alpha modifications" into qt-dev 2019-05-28 13:46:27 +00:00
Chalard Jean
4c7a27b2ac [automerger skipped] Merge "Make the memory store operations serial." into qt-dev 
am: 1e5e72f27c -s ours
am skip reason: change_id I10b5c5cd85fcb76924ba96c8c379be677774705d with SHA1 5d258aecb6 is in history

Change-Id: Iac14b79757d328a0f00519b9bd88036bf53aad71
 2019-05-28 06:42:06 -07:00
TreeHugger Robot
1e5e72f27c Merge "Make the memory store operations serial." into qt-dev 2019-05-28 13:36:25 +00:00
Chalard Jean
ae4c7775e2 Let the system server have CONNECTIVITY_USE_RESTRICTED_NETWORKS. 
Also :
- Fix testUidFilteringDuringVpnConnectDisconnectAndUidUpdates that
  was failing on devices with a first released SDK >= Q
- Add a test actually tests that the system has the permission, as
  the test was only testing what's in the mock

Bug: 119770201
Test: New test making sure this stays true
Merged-In: I74cf5f0fa17fcf818f1fed78c7e3e4375c20152e
Change-Id: I0daa644fbad8e389ad7cfa66c0e3b3480c8bb50a
(cherry picked from commit 629b49d58f)
 2019-05-28 13:30:14 +00:00
Kyunglyul Hyun
771f1b5442 Merge "CastTile: Set media router group id to sync cast status" into qt-dev 
am: 963fadf871

Change-Id: I572e3b66a23f5e6cb2104f8b70e7b39dae1a5bdc
 2019-05-28 06:16:52 -07:00
TreeHugger Robot
963fadf871 Merge "CastTile: Set media router group id to sync cast status" into qt-dev 2019-05-28 13:02:52 +00:00
Chalard Jean
b1298f4dcb Merge "Let the system server have CONNECTIVITY_USE_RESTRICTED_NETWORKS." am: 70682e9f17 
am: c008c062fb

Change-Id: Ie70b2e7ce28e8e8c070d5b0929f1a6beb855da46
 2019-05-28 05:47:17 -07:00
Chalard Jean
c008c062fb Merge "Let the system server have CONNECTIVITY_USE_RESTRICTED_NETWORKS." 
am: 70682e9f17

Change-Id: If6f20f449b9e161a74ee8b5d8fbafffa081740a5
 2019-05-28 05:42:08 -07:00
Matt Pietal
ab343a10eb Merge "Resolver - Fix bottom spacing issue with edge-to-edge" into qt-dev 
am: ea73bddd5b

Change-Id: I0efc3076d9e42f28531fff2a9caf6eca3131687d
 2019-05-28 05:42:07 -07:00
TreeHugger Robot
ea73bddd5b Merge "Resolver - Fix bottom spacing issue with edge-to-edge" into qt-dev 2019-05-28 12:29:28 +00:00
Chalard Jean
70682e9f17 Merge "Let the system server have CONNECTIVITY_USE_RESTRICTED_NETWORKS." 2019-05-28 12:26:10 +00:00
Chalard Jean
0ff658536a Make the memory store operations serial. 
Bug: 128499160
Test: new test in this patch

Change-Id: I6ccdc801e3888a61b22272c8ce9480f45fa26df2
(cherry picked from commit 3074f10b41)
Merged-In: I10b5c5cd85fcb76924ba96c8c379be677774705d
 2019-05-28 11:19:58 +00:00
Chalard Jean
c8697f7246 Merge "Make the memory store operations serial." am: 1f397201e3 
am: dbca5369f5

Change-Id: I4a1db34b59519dd29c3df477ca99acacd6db225a
 2019-05-28 04:03:55 -07:00
Chalard Jean
dbca5369f5 Merge "Make the memory store operations serial." 
am: 1f397201e3

Change-Id: Ib10790ff27f7fe0894df6172cb18444506d847f6
 2019-05-28 03:58:44 -07:00
Chalard Jean
1f397201e3 Merge "Make the memory store operations serial." 2019-05-28 10:51:19 +00:00
Xiao Ma
c37d236032 [automerger skipped] Merge "Wipe the data in IpMemoryStore database upon network factory reset." into qt-dev 
am: 358c2b33f3 -s ours
am skip reason: change_id I13ad04454e638905b74dd42a1c83266c7c37652f with SHA1 29f6cdcd42 is in history

Change-Id: I3cf152c683a9c09245b05341973e31bd1715668f
 2019-05-28 03:48:49 -07:00
Bin Chen
ec882560da [automerger skipped] Merge "Fix deadlock which causing ANR" am: 4b2247d506 
am: e529a5b8ca -s ours
am skip reason: change_id Idf0373ab0d5033d56da0f6f45d7d953f7e796813 with SHA1 c8beb5c0f0 is in history

Change-Id: I93cd0362279355243b2a4504e4d750d7fbbb491b
 2019-05-28 03:39:13 -07:00
Bin Chen
e529a5b8ca Merge "Fix deadlock which causing ANR" 
am: 4b2247d506

Change-Id: I1a74685364f63255607c78d2a16329b88e39de90
 2019-05-28 03:34:00 -07:00
TreeHugger Robot
358c2b33f3 Merge "Wipe the data in IpMemoryStore database upon network factory reset." into qt-dev 2019-05-28 10:31:21 +00:00
Treehugger Robot
4b2247d506 Merge "Fix deadlock which causing ANR" 2019-05-28 10:29:23 +00:00
Chiachang Wang
9662d52ea4 [automerger skipped] Merge "Clean up for multiple validation result update" into qt-dev 
am: d2307eb494 -s ours
am skip reason: change_id I4424663292c5ad29eb7a888fa6975835721a5d2e with SHA1 ec20a373d1 is in history

Change-Id: I37cc75afcf4c2cfbe86fb5a165073d94e98c6e6d
 2019-05-28 02:58:39 -07:00
Chalard Jean
133e0dc0e8 [automerger skipped] Merge "Reinstate access to a forgotten member" into qt-dev 
am: 12c90b57d3 -s ours
am skip reason: change_id I6f6b2cf75793532d3d537a223b8e15d7304a1e3f with SHA1 25f1828778 is in history

Change-Id: Id859f70e1e7584d3640a43a041126b82b308d84e
 2019-05-28 02:50:36 -07:00
Pavel Grafov
3ce0107a8f Merge "Post encryption notification after attempting to unlock profiles" into qt-dev 
am: dc90c9009b

Change-Id: Ib45b8c61fe0c94c1e8e46bfe0f31482a884fcd91
 2019-05-28 02:48:46 -07:00
Chiachang Wang
d2307eb494 Merge "Clean up for multiple validation result update" into qt-dev 2019-05-28 09:44:47 +00:00
Chalard Jean
12c90b57d3 Merge "Reinstate access to a forgotten member" into qt-dev 2019-05-28 09:38:51 +00:00
TreeHugger Robot
dc90c9009b Merge "Post encryption notification after attempting to unlock profiles" into qt-dev 2019-05-28 09:32:01 +00:00
Vladimir Marko
80b7deb297 Merge "Remove unnecessary dependencies on ART libraries." am: b1ec613190 
am: acf264091b

Change-Id: I9cd5c1eb5dabc7a979c38fe95f848bdf14cab3d7
 2019-05-28 02:08:24 -07:00
Vladimir Marko
acf264091b Merge "Remove unnecessary dependencies on ART libraries." 
am: b1ec613190

Change-Id: I46e001bdd58d08f4d58ae03e23241a02c7ac10ad
 2019-05-28 02:03:16 -07:00
Xiao Ma
d6e2bbb4ea Wipe the data in IpMemoryStore database upon network factory reset. 
Bug:128499160
Test: manual
Test: atest FrameworksNetTests NetworkStackTests
Merged-In: I13ad04454e638905b74dd42a1c83266c7c37652f
Merged-In: Ia13ff10a57c2043f6676976f23ecfb2d2a9a6ef0
(cherry picked from commit ef6ef68c48)

Change-Id: I42507451d55a620c0e2d271c895ad158f348c1a5
 2019-05-28 08:46:44 +00:00
Vladimir Marko
b1ec613190 Merge "Remove unnecessary dependencies on ART libraries." 2019-05-28 08:43:47 +00:00
Gavin Corkery
2676f10410 Merge "Allow PackageManager to retrieve inactive/factory APEXs." into qt-dev 
am: aef1ff0571

Change-Id: Ic9775129a2d2549861ffcaecee60ca73dfdaedbf
 2019-05-28 01:38:11 -07:00
Gavin Corkery
aef1ff0571 Merge "Allow PackageManager to retrieve inactive/factory APEXs." into qt-dev 2019-05-28 08:25:37 +00:00
Chalard Jean
5d258aecb6 Make the memory store operations serial. 
Bug: 128499160
Test: new test in this patch
Change-Id: I10b5c5cd85fcb76924ba96c8c379be677774705d
 2019-05-28 16:56:50 +09:00
Luke Huang
431664822c Merge changes from topic "am-851f19c8d7d34bb48accd48868aae501-qt-dev" into qt-dev 
am: 0edeaa365e

Change-Id: I8cd6013a4312d945936a38026285b2e33f6c7c49
 2019-05-27 22:52:59 -07:00
Luke Huang
20c6f40ff8 [automerger skipped] Add Rfc6724 style sort for DnsResolver and fix potential bug 
am: 7466ac8dc2 -s ours
am skip reason: change_id I0323f5c7f32fc3fa589b9e87f8e7c9caf744dbd4 with SHA1 d352f4ca85 is in history

Change-Id: Ie4e69c27646febd06df2b93361f431dbd51bde4f
 2019-05-27 22:52:47 -07:00
Luke Huang
0edeaa365e Merge changes from topic "am-851f19c8d7d34bb48accd48868aae501-qt-dev" into qt-dev 
* changes:
  Remove broken test testRfc6724Sort
  Add Rfc6724 style sort for DnsResolver and fix potential bug
 2019-05-28 05:38:49 +00:00
Luke Huang
ad7c294c47 Remove broken test testRfc6724Sort 
This test is conitnuely fail in cuttlefish.
Lack of ipv6 default route in cuttlefish caused the test failed.
The reason is that the result of rfc6724Sort depends on on the route in system.
It is not good to expect any route should exists, so remove it.

Bug: 133649648
Test: atest DnsUtilsTest

Merged-In: Idc6db433585de067e45088b43665c8e37b310397
(cherry picked from commit 91b35f8842)

Change-Id: Idb6f4c094d3466772e3bfc98a57505bf38f381ef
 2019-05-28 03:24:14 +00:00
Xiao Ma
29f6cdcd42 Merge "Wipe the data in IpMemoryStore database upon network factory reset." am: 2bc72d2fe0 
am: 0b9f498f86

Change-Id: I13ad04454e638905b74dd42a1c83266c7c37652f
 2019-05-27 18:12:49 -07:00
Xiao Ma
0b9f498f86 Merge "Wipe the data in IpMemoryStore database upon network factory reset." 
am: 2bc72d2fe0

Change-Id: I453b488eec4fe502cd7400c4a19ce41ea22a8c13
 2019-05-27 18:07:38 -07:00
Xiao Ma
2bc72d2fe0 Merge "Wipe the data in IpMemoryStore database upon network factory reset." 2019-05-28 00:52:00 +00:00
Tyler Gunn
6573bea11e Merge "Add extended logging for blocked number contract." into qt-dev 
am: a80dd06e17

Change-Id: I736f17b14fde5625bf707bd558e701b0b32e1a9b
 2019-05-27 17:11:31 -07:00
Tyler Gunn
a80dd06e17 Merge "Add extended logging for blocked number contract." into qt-dev 2019-05-28 00:03:16 +00:00
Nathan Harold
9d8c21fba6 Merge "Deprecate getNetworkType" am: d47ae01063 
am: 40ae3d6281

Change-Id: I6f07d8a9766a89a6b2905124f00a1abd7bf1f4a1
 2019-05-27 14:34:31 -07:00