Commit Graph

86038 Commits

Author SHA1 Message Date
Naomi Musgrave
ff350a2f35 Merge "Include ID in toString of NetworkEvent subclasses, DNS and Connect event" 2018-01-16 15:00:38 +00:00
Oscar Key
0158d976c8 Merge "Add FLAG_INCREMENTAL and FLAG_NON_INCREMENTAL to performBackup()." 2018-01-16 11:17:00 +00:00
Hugo Benichi
060f3cc2b5 Merge "MacAddress: add @NonNull annotations" am: e65a016d76 am: a7c125e5b2
am: 697b7fe9e1

Change-Id: Ib525e2429609ce12c2be5bbeacffa217b65bebe3
2018-01-16 10:40:56 +00:00
Hugo Benichi
697b7fe9e1 Merge "MacAddress: add @NonNull annotations" am: e65a016d76
am: a7c125e5b2

Change-Id: Icaa08c082797c6dbc3382e0662e24e1c84114175
2018-01-16 10:30:20 +00:00
Hugo Benichi
a7c125e5b2 Merge "MacAddress: add @NonNull annotations"
am: e65a016d76

Change-Id: Ia1ea828cfd33b5287639e4fd3ab248a58650168b
2018-01-16 10:18:55 +00:00
Neil Fuller
8e69452978 Merge "Remove code no longer used by telephony" 2018-01-16 08:39:16 +00:00
Hugo Benichi
e65a016d76 Merge "MacAddress: add @NonNull annotations" 2018-01-16 07:10:50 +00:00
TreeHugger Robot
f3fa614fee Merge changes I3d7cef4e,Ie0f43f54
* changes:
  Add missing @Override when {@inheritDoc} exists
  Remove unnecessary qualifiers from InputConnection
2018-01-16 05:50:08 +00:00
Lorenzo Colitti
7e933876fa Merge "Change the netId to nethandle mapping." am: 9456c020d8 am: feaf412e19
am: 93e0bad422

Change-Id: I06e09bfaeb1040b97afa392faace339eb5bab4ad
2018-01-16 05:32:55 +00:00
Lorenzo Colitti
93e0bad422 Merge "Change the netId to nethandle mapping." am: 9456c020d8
am: feaf412e19

Change-Id: Idd1b2f462c1c78bdb68b43a4aa77bf2358f7cb52
2018-01-16 05:16:34 +00:00
Lorenzo Colitti
feaf412e19 Merge "Change the netId to nethandle mapping."
am: 9456c020d8

Change-Id: I605ea54ff9e8e32e4fad6f0346b37849fadbc81a
2018-01-16 05:06:50 +00:00
Hugo Benichi
48872c6342 MacAddress: add @NonNull annotations
This patch adds to the MacAddress class:
  - getAddressType() method which replaces addressType(), for naming
  consistency
  - @NonNull annotations on all input and output reference values for
  all public methods (@hide and public).

TYPE_UNKNOWN, which currently cannot be observed with a non @hide
method, is also removed from the public api.

Bug: 71866627
Test: $ runtest frameworks-net
Change-Id: I2af70408d46f431b7b32183e6b48ddae9a261a2c
2018-01-16 13:32:59 +09:00
Yohei Yukawa
7a8c9aaad8 Add missing @Override when {@inheritDoc} exists
Otherwise, Checkstyle keeps nagging us with the following lint warning
whenever we touch the lines around them.

  Must include @java.lang.Override annotation when {@inheritDoc}
  Javadoc tag exists.

This CL also re-format the license header just to make Checkstyle
happy.

This is purely a no-op style change. There must be no behavior change.

Test: prebuilts/checkstyle/checkstyle.py -f frameworks/base/core/java/android/view/inputmethod/InputConnectionWrapper.java
Change-Id: I3d7cef4e6c1407a6c6d8ee75c0d8b75943d8701c
2018-01-15 19:43:38 -08:00
Yohei Yukawa
77efd914b5 Remove unnecessary qualifiers from InputConnection
Otherwise, Checkstyle keeps nagging us whenever we touch lines around
them.

This CL also re-formats the license header and keep all the lines
within 100 colmun just to make Checkstyle happy.

This is purely a no-op style change. There must be no behavior change.

Test: prebuilts/checkstyle/checkstyle.py -f frameworks/base/core/java/android/view/inputmethod/InputConnection.java
Change-Id: Ie0f43f545d8056884c5d20a601d0a501187062c7
2018-01-15 19:43:27 -08:00
Treehugger Robot
9456c020d8 Merge "Change the netId to nethandle mapping." 2018-01-16 02:58:56 +00:00
Seigo Nonaka
b01e18c3ee Merge "Rename PremeasuredText to MeasuredText" 2018-01-16 00:47:52 +00:00
Tomasz Wasilczyk
793c1030fa Merge "Implement front-end APIs for dynamic program list." 2018-01-15 18:54:19 +00:00
TreeHugger Robot
30b8dd4199 Merge "Tag brightness APIs with @SystemAPI" 2018-01-15 18:31:34 +00:00
Oscar Key
7b1d974d71 Add FLAG_INCREMENTAL and FLAG_NON_INCREMENTAL to performBackup().
These indicate if backup manager passed any previous state to the backup
agent when building a backup. The transport will use these to decide
whether to clear any existing encryption related state for the app.

I left the new flags as @hide for now.

Bug: b/71792427
Test: Tested manually with a buid of GmsCore updated to process the new
flag. I am attempting to write a robolectric test.

Change-Id: Ica0f6f578cd7d1ad29af532a45a2ee6685c84747
2018-01-15 18:22:29 +00:00
Richard Ledley
68b17a7ebd Merge "Add flag to control smart linkify." 2018-01-15 17:40:46 +00:00
Lorenzo Colitti
e4fc6322a4 Change the netId to nethandle mapping.
Being able to update this handle is necessary to ensure that
system-only OTAs do not break vendor code that relies on
nethandles.

Bug: 63052780
Test: walleye builds, boots, networking works
Test: MultinetworkApiTest CTS tests passes
Change-Id: I049a4ad2610ca68b8f56377b63be7e5e8ce76039
2018-01-16 02:08:09 +09:00
Neil Fuller
11351b655b Remove code no longer used by telephony
This code was previously used by telephony
but was removed by frameworks/opt/telephony
commit a0f09cee0f6328ea104b9ef965a387b4a4652e8a

Bug: 63743683
Test: make droid
Change-Id: I83deffc2aadc098e1c976bf164a752e19b96c77a
2018-01-15 17:02:07 +00:00
Tomasz Wasilczyk
436128f23a Implement front-end APIs for dynamic program list.
Bug: 69860743
Test: instrumentation
Change-Id: I326865c690d315b867626599174e34911564ef9e
2018-01-15 08:26:23 -08:00
TreeHugger Robot
23374d63ec Merge "Move startUserInBackground to standalone and avoid user from being stopped unnecessarily" 2018-01-15 13:56:36 +00:00
Richard Ledley
9cfa60673a Add flag to control smart linkify.
Test: manual

Change-Id: If72f031b37ed313828d97d500af587bed6e8383b
2018-01-15 13:14:06 +00:00
yuemingw
a178144906 Add DISALLOW_AMBIENT_DISPLAY.
Bug: 67675787
Test: cts will be added in b/67675794

Change-Id: Ic859783e05e54ea88d98db517891d41353ad033d
2018-01-15 11:33:18 +00:00
TreeHugger Robot
1f31d9a8dd Merge "Making TextClassifier helper objects parcelable" 2018-01-15 11:26:06 +00:00
TreeHugger Robot
2bb444136a Merge changes I30b40c48,I7d02c54c,Id68ebd35
* changes:
  Use lambda when appropriate
  Remove redundant type casts
  Fix JavaDoc errors
2018-01-15 02:19:15 +00:00
Yohei Yukawa
623e94b857 Use lambda when appropriate
This is a safe refactoring that should have no behavior change in
terms of semantics and performance characteristics.

Test: make -j checkbuild
Change-Id: I30b40c483e490ff42c1c707233ca5cc7b67da28f
2018-01-14 16:30:59 -08:00
Yohei Yukawa
31a260f144 Remove redundant type casts
Test: make -j checkbuild
Change-Id: I7d02c54c09543848711c1f3204719a79593a3cbd
2018-01-14 16:24:26 -08:00
Yohei Yukawa
2b63434b93 Follow method renamings
This is a follow up CL to a recent CL [1], which deprecated several
APIs InputMethodManager class but forgot to update some of existing
call sites in InputMethodService to use new method names.

This CL only addresses deprecated API usage warnings.  There should be
no behavior change.

 [1]: I3163f3cbe557c85103ca287bee0874a3b4194032
      d8d03a8e1b

Bug: 70282603
Test: atest CtsInputMethodTestCases
Change-Id: I709ca997523ac9a9cd2d236f3158bbb18cf2edc3
2018-01-14 16:15:31 -08:00
Yohei Yukawa
b2a0e0509a Fix JavaDoc errors
Test: make -j checkbuild
Change-Id: Id68ebd3588cd286c821da49e3bda4299d311e8b9
2018-01-14 16:06:16 -08:00
TreeHugger Robot
82548f4bc3 Merge "Implement DISALLOW_SHARE_INTO_MANAGED_PROFILE" 2018-01-13 16:40:41 +00:00
Dmitry Dementyev
7d8c78a2c8 Refactor KeyStore Recovery Manager.
1) Parameters -> Params
2) Use byte[] for serivice parameters.
2) Move Exception into separate class.

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

Change-Id: I1b9a8748830f7deb9eeb57693f5a818a49a7aabe
2018-01-12 21:06:25 -08:00
TreeHugger Robot
aa8be75854 Merge "Turn on app info v2 feature." 2018-01-13 02:02:39 +00:00
Lucas Dupin
e1daf52b92 Merge "Allow custom keyguard "prompt reason"" 2018-01-13 01:13:26 +00:00
TreeHugger Robot
2d0a8c0248 Merge "Remove @hide for KEYCODE_ALL_APPS" 2018-01-13 00:41:56 +00:00
TreeHugger Robot
2d38a44938 Merge "Screenshot global actions item." 2018-01-13 00:34:42 +00:00
Richard Ledley
b033685533 Merge "Set selection bounds when we try to copy, so it will work with nonselectable text." 2018-01-13 00:15:19 +00:00
Doris Ling
c5c9b7ffac Turn on app info v2 feature.
Bug: 69384089
Test: rebuild
Change-Id: I362de6232fa0cc790f4884e2fec9715342882167
2018-01-12 16:02:27 -08:00
Shikhar Srivastav
82e3a31f81 Merge "Add VDSO global setting and mapping to sys property." 2018-01-12 23:39:32 +00:00
Yifan Hong
a95523088b Merge "android.os.VintfObject: update for VNDK version format change." am: eac8c121fe am: d9b9d49a66
am: bb2d749981

Change-Id: I330d9cd4fe23b62a605bd95790046c2e0b1aebb0
2018-01-12 23:37:34 +00:00
TreeHugger Robot
bc569cb25c Merge "Fix object pool for lifecycler" 2018-01-12 23:27:55 +00:00
Yifan Hong
bb2d749981 Merge "android.os.VintfObject: update for VNDK version format change." am: eac8c121fe
am: d9b9d49a66

Change-Id: I69512885ec3372e45f775bb7f6a8b828f8be490e
2018-01-12 23:22:02 +00:00
Yifan Hong
d9b9d49a66 Merge "android.os.VintfObject: update for VNDK version format change."
am: eac8c121fe

Change-Id: Ia32c4395546ef58dee88bfbae77ea52d506a1c63
2018-01-12 23:05:35 +00:00
Alison Cichowlas
a2cd19e3d1 Screenshot global actions item.
Refactor TakeScreenshot code out of PhoneWindowManager;
add power menu item for Screenshot.

Test: runtest systemui

Change-Id: Ie8602386cd59f8fd991369d2117f7c4d76f65e41
2018-01-12 17:30:41 -05:00
TreeHugger Robot
d4f6cecae3 Merge "Rename trySetQuietModeEnabled to requestQuietModeEnabled as per ... the feedback from API council" 2018-01-12 22:26:03 +00:00
Tony Mak
bece85dd0e Rename trySetQuietModeEnabled to requestQuietModeEnabled as per ...
the feedback from API council

trySetQuietModeEnabled will be kept for a while until next
Launcher prebuilt is dropped.

FIXES: 71818127

Test: Build

Change-Id: I3d4fd64862c7d924b8da630522a30a3899676b4b
2018-01-12 22:25:32 +00:00
Treehugger Robot
eac8c121fe Merge "android.os.VintfObject: update for VNDK version format change." 2018-01-12 22:12:39 +00:00
Jeff Hamilton
2fd131b492 Merge "Minor LoadedApk refactoring." am: 6ca155f8c2
am: e6fee297a2

Change-Id: I919f7e7e11b64f6155919f7ea631f3f6fd84ce03
2018-01-12 21:43:44 +00:00