OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "[Notif] Dont show blocking helper for non-blockable notifs" into pi-dev
Rohan Shah [Fri, 30 Mar 2018 19:53:32 +0000 (19:53 +0000)]
Merge "[Notif] Dont show blocking helper for non-blockable notifs" into pi-dev
am: 160261a553

Change-Id: I46174e243469e37bad4a8a78060033cb69c2d232

6 years agoMerge "Fix memory leak in ShaderCache" into pi-dev
Stan Iliev [Fri, 30 Mar 2018 19:48:19 +0000 (19:48 +0000)]
Merge "Fix memory leak in ShaderCache" into pi-dev
am: e275d0bc19

Change-Id: I6428c1cfa94456814dedb5ede4ba51f3b1b1d706

6 years agoMerge "Update triggering logic for hybrid notification" into pi-dev
Salvador Martinez [Fri, 30 Mar 2018 19:42:53 +0000 (19:42 +0000)]
Merge "Update triggering logic for hybrid notification" into pi-dev
am: 6abf6254d2

Change-Id: Ie631511fbafddb098bc17df779b72fd1c092b66c

6 years agoMerge "Move HIDL calls away from the main thread" into pi-dev
Yu-Han Yang [Fri, 30 Mar 2018 19:36:55 +0000 (19:36 +0000)]
Merge "Move HIDL calls away from the main thread" into pi-dev
am: 322929af8d

Change-Id: Ida2ce61890408e823dec37f4b1490a03f428d2e7

6 years agoMerge "Skip waiting for draw when triggering split screen from global action." into...
Winson Chung [Fri, 30 Mar 2018 19:31:22 +0000 (19:31 +0000)]
Merge "Skip waiting for draw when triggering split screen from global action." into pi-dev
am: cb903343f0

Change-Id: Ic5c26b8c734463259e5d199c403e7e1d3451ce0c

6 years agoMerge "Add more AppComponentFactory docs" into pi-dev
Jason Monk [Fri, 30 Mar 2018 19:26:53 +0000 (19:26 +0000)]
Merge "Add more AppComponentFactory docs" into pi-dev
am: 7790a2f2d1

Change-Id: I1db5961718407414d32d4d6bd263aa2c0872dc69

6 years agoMerge "Make back mic available when getting all available mic." into pi-dev
jiabin [Fri, 30 Mar 2018 18:48:24 +0000 (18:48 +0000)]
Merge "Make back mic available when getting all available mic." into pi-dev
am: cfe67aa575

Change-Id: I615ca1b647ba3548648fff40198aa0bcd4ea1a04

6 years agoMerge "Remove deprecated generateAndStoreKey method implementation" into pi-dev
Dmitry Dementyev [Fri, 30 Mar 2018 18:40:47 +0000 (18:40 +0000)]
Merge "Remove deprecated generateAndStoreKey method implementation" into pi-dev
am: 912853be10

Change-Id: I977be0a087f6fa2d98e519c384e2694d2117bef3

6 years agoMerge "Catch unbinding errors" into pi-dev
Julia Reynolds [Fri, 30 Mar 2018 18:35:33 +0000 (18:35 +0000)]
Merge "Catch unbinding errors" into pi-dev
am: 47335f6e1c

Change-Id: Ibb4aed1aea64d3f3b1a88829cbdf3cc28a1799d5

6 years agoMerge "Add OEM_PAID capability to system api" into pi-dev
Pavel Maltsev [Fri, 30 Mar 2018 18:30:23 +0000 (18:30 +0000)]
Merge "Add OEM_PAID capability to system api" into pi-dev
am: 8982a81f3c

Change-Id: Ic164c4a29cd449a31b2f1c12c8c345bcc5dc77fa

6 years agoMerge "API council requested tweaks to NetworkRequest." into pi-dev
Jeff Sharkey [Fri, 30 Mar 2018 18:22:13 +0000 (18:22 +0000)]
Merge "API council requested tweaks to NetworkRequest." into pi-dev
am: e6b1a7804d

Change-Id: I0d090ebb7d57689a061badcf593ae9a37d88f7ce

6 years agoMerge "Show media stream always when a11y is active stream" into pi-dev
Julia Reynolds [Fri, 30 Mar 2018 18:16:25 +0000 (18:16 +0000)]
Merge "Show media stream always when a11y is active stream" into pi-dev
am: 9ba5dfc750

Change-Id: Ib60cb268a33cf1f4658647514fe606df914ed945

6 years agoMerge "[QS] Override/add long click accessibility action" into pi-dev
Rohan Shah [Fri, 30 Mar 2018 18:11:23 +0000 (18:11 +0000)]
Merge "[QS] Override/add long click accessibility action" into pi-dev
am: 2d2f598d69

Change-Id: Ia11527f6bc12477744dc597b3521323b5fcd2c86

6 years agoMerge "System notif channels updated on locale change" into pi-dev
Beverly [Fri, 30 Mar 2018 18:06:14 +0000 (18:06 +0000)]
Merge "System notif channels updated on locale change" into pi-dev
am: e3ba496485

Change-Id: Ic104cb322ab217251eb715fd4e7c9f8a48fda1e5

6 years agoMerge "Slices: Fix up some formatting and add examples" into pi-dev
Jason Monk [Fri, 30 Mar 2018 18:01:03 +0000 (18:01 +0000)]
Merge "Slices: Fix up some formatting and add examples" into pi-dev
am: ea3377b4d4

Change-Id: Ia042aef5f36acf97b491faf07a5dc010927a6253

6 years agoMerge "Enable Last Kmsg, also fix the GZipSection test." into pi-dev
Yi Jin [Fri, 30 Mar 2018 17:45:47 +0000 (17:45 +0000)]
Merge "Enable Last Kmsg, also fix the GZipSection test." into pi-dev
am: 75c4f589b9

Change-Id: I49efe452e65055a64f44564e0c04b958d82bb332

6 years agoMerge "[Notif] Dont show blocking helper for non-blockable notifs" into pi-dev
TreeHugger Robot [Fri, 30 Mar 2018 17:43:33 +0000 (17:43 +0000)]
Merge "[Notif] Dont show blocking helper for non-blockable notifs" into pi-dev

6 years agoMerge "Allow for the different nav bars before the device is provisioned Split window...
Brad Stenning [Fri, 30 Mar 2018 17:37:24 +0000 (17:37 +0000)]
Merge "Allow for the different nav bars before the device is provisioned Split window creation from content creation so I could remove and add new content once the provisioned state changed." into pi-dev
am: 1fe1ef0d6e

Change-Id: I4595133eef28d81622f35bdcb4fd0a814acb4a41

6 years agoMerge "Fix memory leak in ShaderCache" into pi-dev
TreeHugger Robot [Fri, 30 Mar 2018 17:33:13 +0000 (17:33 +0000)]
Merge "Fix memory leak in ShaderCache" into pi-dev

6 years agoMerge "Make battery saver suggestion configurable" into pi-dev
Makoto Onuki [Fri, 30 Mar 2018 17:32:15 +0000 (17:32 +0000)]
Merge "Make battery saver suggestion configurable" into pi-dev
am: cd21f1c5c2

Change-Id: I4fb41a9382d2a073f7673cdaa5c4a3d670ff4349

6 years agoMerge "Update triggering logic for hybrid notification" into pi-dev
Salvador Martinez [Fri, 30 Mar 2018 17:25:00 +0000 (17:25 +0000)]
Merge "Update triggering logic for hybrid notification" into pi-dev

6 years agoMerge "Move HIDL calls away from the main thread" into pi-dev
TreeHugger Robot [Fri, 30 Mar 2018 17:20:26 +0000 (17:20 +0000)]
Merge "Move HIDL calls away from the main thread" into pi-dev

6 years agoMerge "Skip waiting for draw when triggering split screen from global action." into...
Winson Chung [Fri, 30 Mar 2018 17:16:59 +0000 (17:16 +0000)]
Merge "Skip waiting for draw when triggering split screen from global action." into pi-dev

6 years agoMerge "Add more AppComponentFactory docs" into pi-dev
TreeHugger Robot [Fri, 30 Mar 2018 17:08:23 +0000 (17:08 +0000)]
Merge "Add more AppComponentFactory docs" into pi-dev

6 years agoMerge changes from topics "niap-asym-write-pi-dev", "niap-asym-write-api-pi-dev"...
Brian Young [Fri, 30 Mar 2018 17:05:16 +0000 (17:05 +0000)]
Merge changes from topics "niap-asym-write-pi-dev", "niap-asym-write-api-pi-dev" into pi-dev
am: 0186b42f2a

Change-Id: I18cba5e8695246b45972186e2c79d5d36a61c316

6 years agoMerge "Make back mic available when getting all available mic." into pi-dev
TreeHugger Robot [Fri, 30 Mar 2018 16:59:41 +0000 (16:59 +0000)]
Merge "Make back mic available when getting all available mic." into pi-dev

6 years agoAdd "Unlocked device required" key API
Brian Young [Fri, 30 Mar 2018 16:57:43 +0000 (16:57 +0000)]
Add "Unlocked device required" key API
am: 36716eb470

Change-Id: I5ae5878faa4681dbbf84b16a24c79a5315a97ccb

6 years agoMerge "Remove deprecated generateAndStoreKey method implementation" into pi-dev
Dmitry Dementyev [Fri, 30 Mar 2018 16:44:53 +0000 (16:44 +0000)]
Merge "Remove deprecated generateAndStoreKey method implementation" into pi-dev

6 years agoMerge "Remove password blacklist API" into pi-dev
Rubin Xu [Fri, 30 Mar 2018 16:41:15 +0000 (16:41 +0000)]
Merge "Remove password blacklist API" into pi-dev
am: 69196f6fad

Change-Id: I7e7c2cc2198d001ca068e6ce41befb1bc285b55f

6 years agoMerge "Catch unbinding errors" into pi-dev
Julia Reynolds [Fri, 30 Mar 2018 16:33:40 +0000 (16:33 +0000)]
Merge "Catch unbinding errors" into pi-dev

6 years agoMerge "Don't exit dnd rule for old alarms" into pi-dev
Beverly [Fri, 30 Mar 2018 16:33:19 +0000 (16:33 +0000)]
Merge "Don't exit dnd rule for old alarms" into pi-dev
am: df3788dcd8

Change-Id: Id98f6a123ff7299f7706759e734978c60ac1229a

6 years agoMerge "Add OEM_PAID capability to system api" into pi-dev
Pavel Maltsev [Fri, 30 Mar 2018 16:32:52 +0000 (16:32 +0000)]
Merge "Add OEM_PAID capability to system api" into pi-dev

6 years agoMerge "API council requested tweaks to NetworkRequest." into pi-dev
Jeff Sharkey [Fri, 30 Mar 2018 16:30:24 +0000 (16:30 +0000)]
Merge "API council requested tweaks to NetworkRequest." into pi-dev

6 years agoMerge "Show media stream always when a11y is active stream" into pi-dev
Julia Reynolds [Fri, 30 Mar 2018 16:28:04 +0000 (16:28 +0000)]
Merge "Show media stream always when a11y is active stream" into pi-dev

6 years agoMerge "Update RecoveryController JavaDoc" into pi-dev
Robert Berry [Fri, 30 Mar 2018 16:27:47 +0000 (16:27 +0000)]
Merge "Update RecoveryController JavaDoc" into pi-dev
am: d490937854

Change-Id: Idddc67da9872b9c99a0074e2382b8c79ecf57a86

6 years agoMerge "Fix socket leaks in various android.net.Network methods." into pi-dev
Paul Jensen [Fri, 30 Mar 2018 16:22:51 +0000 (16:22 +0000)]
Merge "Fix socket leaks in various android.net.Network methods." into pi-dev
am: 9c1597bff7

Change-Id: I2a2254ce65c2176ae0be1d6276034b1bb0cad987

6 years ago[automerger skipped] Merge "Use InterfaceSet for upstream interfaces." into pi-dev
Remi NGUYEN VAN [Fri, 30 Mar 2018 16:17:17 +0000 (16:17 +0000)]
[automerger skipped] Merge "Use InterfaceSet for upstream interfaces." into pi-dev
am: 671547b224  -s ours

Change-Id: Idf53f65864df4d18028973d56edb2311f3295919

6 years ago[automerger skipped] Merge "Add tests for IPv4 of dual stack tethering." into pi-dev
Remi NGUYEN VAN [Fri, 30 Mar 2018 16:13:29 +0000 (16:13 +0000)]
[automerger skipped] Merge "Add tests for IPv4 of dual stack tethering." into pi-dev
am: 4140cc106e  -s ours

Change-Id: Ie778c0dc85dc9c49a3b9f6469de26958bfe99aac

6 years agoMerge "Limit the number of routes for performance" into pi-dev
Chalard Jean [Fri, 30 Mar 2018 16:10:31 +0000 (16:10 +0000)]
Merge "Limit the number of routes for performance" into pi-dev
am: 37e8dfa8e9

Change-Id: Ida402ad8f864400561bba0e07cfd5fe766ee08bd

6 years agoMerge "Clarify documentation for getActiveNetworkInfo and friends" into pi-dev
Chalard Jean [Fri, 30 Mar 2018 16:05:29 +0000 (16:05 +0000)]
Merge "Clarify documentation for getActiveNetworkInfo and friends" into pi-dev
am: 1a8d1a51cf

Change-Id: Iab75c8d432ca68031bcf7cbf22baf8269169a908

6 years agoMerge "Relax APF version check in ApfGenerator" into pi-dev
Bernie Innocenti [Fri, 30 Mar 2018 16:00:31 +0000 (16:00 +0000)]
Merge "Relax APF version check in ApfGenerator" into pi-dev
am: 16caf6b62e

Change-Id: I61e37df73de4bf12f41389a7e7f999c44918d11e

6 years ago[automerger skipped] Merge "Allow null subscriberId in NetworkStatsManager." into...
Remi NGUYEN VAN [Fri, 30 Mar 2018 15:55:32 +0000 (15:55 +0000)]
[automerger skipped] Merge "Allow null subscriberId in NetworkStatsManager." into pi-dev
am: bd2c0fa813  -s ours

Change-Id: I6e8983cc087a8a42e1404bb5f99bcd297b0ff313

6 years agoMerge "Add unit test ValueMetricProducer on boundary" into pi-dev
Chenjie Yu [Fri, 30 Mar 2018 15:51:36 +0000 (15:51 +0000)]
Merge "Add unit test ValueMetricProducer on boundary" into pi-dev
am: e647afe321

Change-Id: I768625dec77352801267332e579271d4910a9150

6 years agoMerge "Add more hidden API on light greylist" into pi-dev
David Brazdil [Fri, 30 Mar 2018 15:46:36 +0000 (15:46 +0000)]
Merge "Add more hidden API on light greylist" into pi-dev
am: b5dcf7d3ac

Change-Id: Ia315d1e1b9adc0a94eb5a499fe3d4594f936cb1c

6 years agoMerge "[QS] Override/add long click accessibility action" into pi-dev
Rohan Shah [Fri, 30 Mar 2018 15:45:53 +0000 (15:45 +0000)]
Merge "[QS] Override/add long click accessibility action" into pi-dev

6 years agoMerge "Rename GraphicsTypes.h to GraphicTypes.h" into pi-dev
Peiyong Lin [Fri, 30 Mar 2018 15:40:13 +0000 (15:40 +0000)]
Merge "Rename GraphicsTypes.h to GraphicTypes.h" into pi-dev
am: 3d8fa52f59

Change-Id: Ibfb1682f7d21dfd0b8cd1d63007f89f7a34f06b8

6 years agoMerge "System notif channels updated on locale change" into pi-dev
TreeHugger Robot [Fri, 30 Mar 2018 15:39:27 +0000 (15:39 +0000)]
Merge "System notif channels updated on locale change" into pi-dev

6 years ago[Notif] Dont show blocking helper for non-blockable notifs
Rohan Shah [Thu, 29 Mar 2018 02:05:52 +0000 (19:05 -0700)]
[Notif] Dont show blocking helper for non-blockable notifs

If the notification is considered non-blockable, we don't want to show
it. Moved necessary logic around into the appropriate classes (minor
refactor).

Cached system info (IPC) in ExpandableNotifRow instead of calling so
late in the game.

Updated tests & added nonblocking checks.

Change-Id: Ic010a0b32cf6df42e9d0d2c600cbbe95a68ffde2
Bug: 74115090
Test: atest {notif tests}
Test: Visually via debug flag on sys notif

6 years agoMerge "Fix drawing sequence from using deprecated Canvas APIs." into pi-dev
Derek Sollenberger [Fri, 30 Mar 2018 15:34:56 +0000 (15:34 +0000)]
Merge "Fix drawing sequence from using deprecated Canvas APIs." into pi-dev
am: 491c654434

Change-Id: Id19576b1c04338476fcb6c33eb7fc62bd5eb63d7

6 years agoMerge "Add isAudioOn() in HeadsetProfile" into pi-dev
ryanywlin [Fri, 30 Mar 2018 15:29:57 +0000 (15:29 +0000)]
Merge "Add isAudioOn() in HeadsetProfile" into pi-dev
am: 5b4eed556b

Change-Id: I6303ae5770af0bb350e3a3c6ffabbd0f90e707ed

6 years agoMerge "Show ripples in QQS." into pi-dev
Amin Shaikh [Fri, 30 Mar 2018 15:24:57 +0000 (15:24 +0000)]
Merge "Show ripples in QQS." into pi-dev
am: a23047e434

Change-Id: Ie652b2b53709761c141829fadafb86deff7dd8a3

6 years agoMerge "Volume UI updates" into pi-dev
Julia Reynolds [Fri, 30 Mar 2018 15:20:39 +0000 (15:20 +0000)]
Merge "Volume UI updates" into pi-dev
am: 2876e83a49

Change-Id: I24fe049a0dc5664ef90a42a28231b30fdc12e5ab

6 years agoMerge "Update AndroidTest.xml to be APCT suite ready" into pi-dev
jdesprez [Fri, 30 Mar 2018 15:15:54 +0000 (15:15 +0000)]
Merge "Update AndroidTest.xml to be APCT suite ready" into pi-dev
am: 197e1d5cc5

Change-Id: I4acf1b35f4d0ff1f17299e0ffed16e2981b55435

6 years agoMerge "Slices: Fix up some formatting and add examples" into pi-dev
TreeHugger Robot [Fri, 30 Mar 2018 15:09:26 +0000 (15:09 +0000)]
Merge "Slices: Fix up some formatting and add examples" into pi-dev

6 years agoMerge "Add Network.fromNetworkHandle()" into pi-dev
Lorenzo Colitti [Fri, 30 Mar 2018 14:55:48 +0000 (14:55 +0000)]
Merge "Add Network.fromNetworkHandle()" into pi-dev
am: c0b767a937

Change-Id: I22e68ab29982690dee5b2c0c6e1fbd47df0b0326

6 years agoMerge "Enable Last Kmsg, also fix the GZipSection test." into pi-dev
TreeHugger Robot [Fri, 30 Mar 2018 14:54:55 +0000 (14:54 +0000)]
Merge "Enable Last Kmsg, also fix the GZipSection test." into pi-dev

6 years agoMerge "AppStandby exemption: sync requested by FG apps" into pi-dev
Makoto Onuki [Fri, 30 Mar 2018 14:48:06 +0000 (14:48 +0000)]
Merge "AppStandby exemption: sync requested by FG apps" into pi-dev
am: 929ce0086a

Change-Id: If4d60cefecf3a469ce9a7fbb2690f5120f77b858

6 years agoMerge "Return PERMISSION_DENIED instead of NPE when missing ActivityManager" into...
Erik Wolsheimer [Fri, 30 Mar 2018 14:43:17 +0000 (14:43 +0000)]
Merge "Return PERMISSION_DENIED instead of NPE when missing ActivityManager" into pi-dev
am: dedc5d7141

Change-Id: I1515bf52b3561e7ce2c66adb8a4a9f87f0e012c7

6 years agoMerge "Allow for the different nav bars before the device is provisioned Split window...
TreeHugger Robot [Fri, 30 Mar 2018 14:38:34 +0000 (14:38 +0000)]
Merge "Allow for the different nav bars before the device is provisioned Split window creation from content creation so I could remove and add new content once the provisioned state changed." into pi-dev

6 years agoMerge "Unhide MediaPlayer#MEDIA_INFO_STARTED_AS_NEXT" into pi-dev
Dongwon Kang [Fri, 30 Mar 2018 14:38:22 +0000 (14:38 +0000)]
Merge "Unhide MediaPlayer#MEDIA_INFO_STARTED_AS_NEXT" into pi-dev
am: b814355d17

Change-Id: If15237f7b3b589c8a010cf44011a3a5e4db61248

6 years agoMerge changes from topics "DocumentSource", "ID_API" into pi-dev
Leon Scroggins [Fri, 30 Mar 2018 14:30:05 +0000 (14:30 +0000)]
Merge changes from topics "DocumentSource", "ID_API" into pi-dev
am: 3c4e33a4fe

Change-Id: I40c56566ec27821da7ecc15b54b20014fbc90b95

6 years agoMerge "Make battery saver suggestion configurable" into pi-dev
TreeHugger Robot [Fri, 30 Mar 2018 14:29:30 +0000 (14:29 +0000)]
Merge "Make battery saver suggestion configurable" into pi-dev

6 years agoRename getters and setters on ImageDecoder
Leon Scroggins III [Fri, 30 Mar 2018 14:23:17 +0000 (14:23 +0000)]
Rename getters and setters on ImageDecoder
am: d62f27250a

Change-Id: I51fd44e48732f0eab0db60f829bece5c8760d38e

6 years agoMerge changes from topics "niap-asym-write-pi-dev", "niap-asym-write-api-pi-dev"...
Brian Young [Fri, 30 Mar 2018 14:21:19 +0000 (14:21 +0000)]
Merge changes from topics "niap-asym-write-pi-dev", "niap-asym-write-api-pi-dev" into pi-dev

* changes:
  Restore "Add "Unlocked device required" parameter to keys"
  Add "Unlocked device required" key API

6 years agoFix memory leak in ShaderCache
Stan Iliev [Thu, 29 Mar 2018 17:33:53 +0000 (13:33 -0400)]
Fix memory leak in ShaderCache

Fix memory leak in a limited memory situation within
ShaderCache::load().

Bug: 76213660
Test: Passed ShaderCacheTest unit test, ran a build on device.
Change-Id: Ibb6ea8fe167eb22bcbbaffc4cfffac12eda98c42

6 years agoCatch unbinding errors
Julia Reynolds [Fri, 30 Mar 2018 14:19:35 +0000 (10:19 -0400)]
Catch unbinding errors

Test: none
Change-Id: Ia8ca50c7c55b86fac84a04a5e4ef2aa36ae6bf6e
Fixes: 72206319

6 years agoShow media stream always when a11y is active stream
Julia Reynolds [Fri, 30 Mar 2018 14:16:09 +0000 (10:16 -0400)]
Show media stream always when a11y is active stream

Test: manual
Bug: 76438403
Change-Id: I9da010b9bb03dfdcb48fc15e3c6d538d540f8f11

6 years agoMerge "Fix Skia's impl for TextureView.getBitmap" into pi-dev
Leon Scroggins III [Fri, 30 Mar 2018 14:12:21 +0000 (14:12 +0000)]
Merge "Fix Skia's impl for TextureView.getBitmap" into pi-dev
am: 5d27097739

Change-Id: I426e6cf6da60b7b82d51d671ce7c35b19d6cb62b

6 years agoMerge "Add more privacy tags." into pi-dev
Yi Jin [Fri, 30 Mar 2018 14:02:17 +0000 (14:02 +0000)]
Merge "Add more privacy tags." into pi-dev
am: 0246723afe

Change-Id: I646514c3c8f8a30c21583ea5f41de9a1e4f9dc35

6 years agoAdd more AppComponentFactory docs
Jason Monk [Wed, 28 Mar 2018 21:46:03 +0000 (17:46 -0400)]
Add more AppComponentFactory docs

Test: TH
Change-Id: I9978d182433a71a04d019304ebe59bd7de8bfeae
Fixes: 74408467

6 years agoMerge "Remove password blacklist API" into pi-dev
Rubin Xu [Fri, 30 Mar 2018 13:38:31 +0000 (13:38 +0000)]
Merge "Remove password blacklist API" into pi-dev

6 years agoMerge "apf: adjust JNI to accept_packet()'s new signature" am: 786150bc09
Bernie Innocenti [Fri, 30 Mar 2018 13:17:15 +0000 (13:17 +0000)]
Merge "apf: adjust JNI to accept_packet()'s new signature" am: 786150bc09
am: 6b9e31d7eb

Change-Id: I1674ac22f00af037ad415a4436b94b2eec6a02b7

6 years agoMerge "Don't exit dnd rule for old alarms" into pi-dev
TreeHugger Robot [Fri, 30 Mar 2018 13:16:46 +0000 (13:16 +0000)]
Merge "Don't exit dnd rule for old alarms" into pi-dev

6 years agoMerge "apf: adjust JNI to accept_packet()'s new signature"
Bernie Innocenti [Fri, 30 Mar 2018 13:05:05 +0000 (13:05 +0000)]
Merge "apf: adjust JNI to accept_packet()'s new signature"
am: 786150bc09

Change-Id: I966776e6574cbf167a6148e20d40e2bdcc887327

6 years agoMerge "apf: adjust JNI to accept_packet()'s new signature"
Bernie Innocenti [Fri, 30 Mar 2018 11:51:41 +0000 (11:51 +0000)]
Merge "apf: adjust JNI to accept_packet()'s new signature"

6 years agoMerge "wifi metrics(proto): Add new metrics for wifi native failures" into pi-dev
Roshan Pius [Fri, 30 Mar 2018 11:12:21 +0000 (11:12 +0000)]
Merge "wifi metrics(proto): Add new metrics for wifi native failures" into pi-dev
am: 8dc5b8b53e

Change-Id: I16841161fde8df64defc7770b438453a2914d576

6 years agoMerge "Revert "Install for all on replace"" into pi-dev
Patrick Baumann [Fri, 30 Mar 2018 11:03:54 +0000 (11:03 +0000)]
Merge "Revert "Install for all on replace"" into pi-dev
am: 27c003dcde

Change-Id: I5123ec44302a80c2d1e0c8655890898c6d1bc81d

6 years agoMerge "Revert "[QS] Update landscape UI"" into pi-dev
Rohan Shah [Fri, 30 Mar 2018 10:58:52 +0000 (10:58 +0000)]
Merge "Revert "[QS] Update landscape UI"" into pi-dev
am: a994156b55

Change-Id: I7c325c2367ace2807c0597fee8fb983bcc970dbd

6 years agoMerge changes I3e542532,Id8f2147f into pi-dev
Julia Reynolds [Fri, 30 Mar 2018 10:54:11 +0000 (10:54 +0000)]
Merge changes I3e542532,Id8f2147f into pi-dev
am: 68256e09d9

Change-Id: Iffa80c2254d25336d52c0f502b4c050c9c448581

6 years agoMerge "Minor correction to the javadoc to match implementation" into pi-dev
Bo Zhu [Fri, 30 Mar 2018 10:48:36 +0000 (10:48 +0000)]
Merge "Minor correction to the javadoc to match implementation" into pi-dev
am: 3cda0f2989

Change-Id: I74097793f02cf97d0e61961d01df3c96fcbefb58

6 years ago[automerger skipped] Merge "Add documentation for TCP interactions with transforms...
Benedict Wong [Fri, 30 Mar 2018 10:43:36 +0000 (10:43 +0000)]
[automerger skipped] Merge "Add documentation for TCP interactions with transforms" into pi-dev
am: dab50eecfd  -s ours

Change-Id: I6f24e8fbffedccbbce98c8bfede66ffc764a58ec

6 years agoMerge "Update RecoveryController JavaDoc" into pi-dev
Robert Berry [Fri, 30 Mar 2018 10:37:41 +0000 (10:37 +0000)]
Merge "Update RecoveryController JavaDoc" into pi-dev

6 years agoMerge "Creating java package for Privacy proto." into pi-dev
Kweku Adams [Fri, 30 Mar 2018 10:36:47 +0000 (10:36 +0000)]
Merge "Creating java package for Privacy proto." into pi-dev
am: 12912d71b1

Change-Id: If1f06051aede2003fc72ba84ef70a81e2f3965f6

6 years agoUpdate RecoveryController JavaDoc
Robert Berry [Thu, 29 Mar 2018 16:19:38 +0000 (17:19 +0100)]
Update RecoveryController JavaDoc

Try to encode as many requirements as possible into the Recovery Agent
JavaDoc.

Bug: 70900575
Test: None, it is documentation
Change-Id: Iae05be24fa29d885f560943f256fd8d7ca692cf7

6 years agoMerge "Handle public volumes and otherwise invalid UUIDs." into pi-dev
Jeff Sharkey [Fri, 30 Mar 2018 10:31:32 +0000 (10:31 +0000)]
Merge "Handle public volumes and otherwise invalid UUIDs." into pi-dev
am: ee1661f7cd

Change-Id: Ibaed0d6289ce9312f2acc2701cea9cee90740492

6 years agoMerge "Add support for testing mode root certificate." into pi-dev
Dmitry Dementyev [Fri, 30 Mar 2018 10:26:18 +0000 (10:26 +0000)]
Merge "Add support for testing mode root certificate." into pi-dev
am: 2d3e4b7437

Change-Id: I24ac397b82ec0ce0913f4aa9c8bad9481ed5a970

6 years ago[automerger skipped] Merge "Fix seccomp filter set up in zygote" into pi-dev
Victor Hsieh [Fri, 30 Mar 2018 10:20:20 +0000 (10:20 +0000)]
[automerger skipped] Merge "Fix seccomp filter set up in zygote" into pi-dev
am: d523130af7  -s ours

Change-Id: Ie0821297f0f53865364c08edd1bbd11794428f96

6 years agoMerge "Fix socket leaks in various android.net.Network methods." into pi-dev
TreeHugger Robot [Fri, 30 Mar 2018 09:47:51 +0000 (09:47 +0000)]
Merge "Fix socket leaks in various android.net.Network methods." into pi-dev

6 years agoMerge "Relax APF version check in ApfGenerator" am: 51dab0ed9d
Bernie Innocenti [Fri, 30 Mar 2018 09:37:55 +0000 (09:37 +0000)]
Merge "Relax APF version check in ApfGenerator" am: 51dab0ed9d
am: 45dd4b7930

Change-Id: If32b43fc217e5966fd6620d5c103c70883990842

6 years agoMerge "Relax APF version check in ApfGenerator"
Bernie Innocenti [Fri, 30 Mar 2018 09:25:47 +0000 (09:25 +0000)]
Merge "Relax APF version check in ApfGenerator"
am: 51dab0ed9d

Change-Id: Id8d2d9df1e562ae15e63ba50e65ab6e67dab108c

6 years agoMerge "Use InterfaceSet for upstream interfaces." into pi-dev
Remi NGUYEN VAN [Fri, 30 Mar 2018 09:15:13 +0000 (09:15 +0000)]
Merge "Use InterfaceSet for upstream interfaces." into pi-dev

6 years agoMerge "Add tests for IPv4 of dual stack tethering." into pi-dev
Remi NGUYEN VAN [Fri, 30 Mar 2018 09:13:50 +0000 (09:13 +0000)]
Merge "Add tests for IPv4 of dual stack tethering." into pi-dev

6 years agoUse InterfaceSet for upstream interfaces.
Remi NGUYEN VAN [Fri, 9 Mar 2018 05:07:18 +0000 (14:07 +0900)]
Use InterfaceSet for upstream interfaces.

Allows using different upstream interfaces for IPv4 and IPv6.

Bug: 38218697
Bug: 64382985
Bug: 64976379
Bug: 64995262
Bug: 64380515
Test: runtest frameworks-net, manual (with aosp/644099 applied)
(cherry-pick of aosp I3db63f7aa5255a0229253187def7590a386c5133)
Merged-In: Ic8602dd029b5a9626aaf6651315b82ab6327037c
Merged-In: I015ac946afa581be1d94f10ab766ac00f5a4ede0

Change-Id: I8c48dab5eb67e60dadbfa974122fc884f4badd15

6 years agoAdd tests for IPv4 of dual stack tethering.
Remi NGUYEN VAN [Thu, 15 Mar 2018 02:57:14 +0000 (11:57 +0900)]
Add tests for IPv4 of dual stack tethering.

Also refactoring some Tethering and TetherInterfaceStateMachine calls
to address testability issues.

This is in preparation of other work to have IPv6-only or 464xlat
tethering working.

Test: runtest frameworks-net
Bug: 38218697
Bug: 64382985
Bug: 64976379
Bug: 64995262
Merged-In: I3b91125b1a715690c2cd417b1e937e568c755d9f
Merged-In: I05de77d9b90d147bf1d6ee7f7ee19a049afddfa1
(cherry-pick of aosp I721aca4789ddfbee5a97316aae0b378d79ee2107)

Change-Id: Idfdd1b9cd5419c1f51f0fbb1eba2f36a9c12474b

6 years agoMerge "Mark networks with OEM_PAID always restricted" am: 8e338f7dae
Lorenzo Colitti [Fri, 30 Mar 2018 09:05:09 +0000 (09:05 +0000)]
Merge "Mark networks with OEM_PAID always restricted" am: 8e338f7dae
am: b9cce46ba8

Change-Id: I88500f6add4f1a6c8a77eb976a489c11c7dc5b6d

6 years agoMerge "Limit the number of routes for performance" am: b8a1509d68
Chalard Jean [Fri, 30 Mar 2018 08:58:44 +0000 (08:58 +0000)]
Merge "Limit the number of routes for performance" am: b8a1509d68
am: 7d25b9abf6

Change-Id: I1fcf34b553b4a7cbadd0a2a7bf697140e948243e

6 years agoMerge "Clarify documentation for getActiveNetworkInfo and friends" am: 39d6694208
Chalard Jean [Fri, 30 Mar 2018 08:51:38 +0000 (08:51 +0000)]
Merge "Clarify documentation for getActiveNetworkInfo and friends" am: 39d6694208
am: 3621eb75cb

Change-Id: I339bb71182723907ed078e8be739c4d4ea2d1da5

6 years agoMerge "Limit the number of routes for performance" into pi-dev
TreeHugger Robot [Fri, 30 Mar 2018 08:48:25 +0000 (08:48 +0000)]
Merge "Limit the number of routes for performance" into pi-dev

6 years agoMerge "Mark networks with OEM_PAID always restricted"
Lorenzo Colitti [Fri, 30 Mar 2018 08:47:25 +0000 (08:47 +0000)]
Merge "Mark networks with OEM_PAID always restricted"
am: 8e338f7dae

Change-Id: I4ffcf01e1f79c8a3570ea2b819688b55904939fe

6 years agoMerge "Limit the number of routes for performance"
Chalard Jean [Fri, 30 Mar 2018 08:42:42 +0000 (08:42 +0000)]
Merge "Limit the number of routes for performance"
am: b8a1509d68

Change-Id: If4de2779b24560f75a7bb977dbb0f996115a0648