Commit Graph

277484 Commits

Author SHA1 Message Date
Colin Cross
9625912b7f Merge "Convert libandroidfw to Android.bp"
am: 46ec8dba83

Change-Id: I32a737c491eeb95ad080adacd47602ee814ba0cb
2016-12-03 04:14:58 +00:00
Treehugger Robot
41f14f47a5 Merge "Update Samsung Print Recommendation Plugin (to support Mopria printers)" 2016-12-03 03:53:18 +00:00
Roshan Pius
f301986727 Merge changes from topic 'fast-bss-transition'
* changes:
  Add capability flag for 802.11r fast BSS transition
  Add constants for 802.11r
2016-12-02 23:57:40 +00:00
Treehugger Robot
d758ce1586 Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag." 2016-12-02 23:41:36 +00:00
Treehugger Robot
46ec8dba83 Merge "Convert libandroidfw to Android.bp" 2016-12-02 23:16:49 +00:00
Chris Tate
e8c0e1098e Merge "Fix the deadlock problem"
am: fa228e06f6

Change-Id: I862d3cedcf38c81f22559439aa8f00ac2ab3cca3
2016-12-02 22:45:47 +00:00
Chris Tate
fa228e06f6 Merge "Fix the deadlock problem" 2016-12-02 22:39:57 +00:00
Jaekyun Seok
5705ad69db Merge "Remove static link in Android framework under /frameworks/base."
am: c60963e451

Change-Id: I0bbb3cf9a66752f6ee8218a4ac5545091130bbed
2016-12-02 19:35:03 +00:00
Colin Cross
ce2221e0ff Convert libandroidfw to Android.bp
See build/soong/README.md for more information.

Test: libandroidfw_tests
Merged-In: I4e575d62f724d5ffe43f12ff5642fb6799f7819e
Change-Id: I4e575d62f724d5ffe43f12ff5642fb6799f7819e
(cherry picked from commit 4f8d9e69eb)
2016-12-02 11:23:12 -08:00
Treehugger Robot
c60963e451 Merge "Remove static link in Android framework under /frameworks/base." 2016-12-02 19:21:47 +00:00
Robert Sesek
bbcd9d26b1 Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote."
am: eda1af611f

Change-Id: I539fb728175c109a93cbff7d8929b584e88bb70c
2016-12-02 17:15:23 +00:00
Treehugger Robot
eda1af611f Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote." 2016-12-02 17:02:31 +00:00
Tobias Thierer
9f00d71787 Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64
Previously, they weres using libcore.io.Base64, which is @deprecated.

The two implementations' encoders produce the exact same result.

The two implementations' decoders' behavior differs for malformed
input:
 - In case of error, libcore.io.Base64.decode() returns null while
   java.util.Base64.getDecoder().decode() throws.
 - java.util.Base64 tends to be stricter about rejecting malformed
   input; specifically, it allows neither whitespace nor unexpected
   '=' characters (should only occur in the padding) whereas
   libcore.io.Base64.decode() leniently allows them throughout the
   input.
 - if the input terminates prematurely, libcore.io.Base64 tends to
   return fewer bytes (stops at a four byte boundary).

The behavior differences for malformed Base64 encoded data should
not affect ShortcutPackageInfo because it should only need to deal
with XML attribute values written by itself, which are well-formed.
Note that this CL does not lead to any known changes of the encoding
step, so values written by earlier versions should not cause problems
when read by later versions of ShortcutPackageInfo.

StrictJarVerifier may now reject or behave differently for .jar /
.zip files with malformed attribute values but this seems okay since,
per its name, it is meant to be strict. For example, after this CL,
StrictJarVerifier will no longer accept algorithm + "-Digest"
attribute values with extra whitespace or padding characters as valid.

Test: Confirmed that the two implementations' encoders produce the
      same result by running the following code just before this CL:
      assertEquals(
          libcore.io.Base64.encode(allBytes()),
          Base64.getEncoder().encodeToString(allBytes()));
      where allBytes() returns a byte[] with values (byte) 0 .. (byte) 255
Test: Test that phone still boots after flashing code that includes
      this CL.
Test: CtsLibcoreTestCases

Bug: 31292683

Change-Id: I775d32f329f693514a8f14d87e1ef0d7a757e6c3
2016-12-02 16:20:53 +00:00
NIEJuhu
8708c80cde ExifInterface: fix NegativeArraySizeException
The IFD entry has a 4-byte field COUNT. It is read as int type
and is used as array size by ExifInterface. If a crafted JPEG
file contains a negative value, a NegativeArraySizeException
occurs.

Change-Id: Ief29936400f04636928df09e7f357cbf25345383
Signed-off-by: NIEJuhu <niejuhu@xiaomi.com>
2016-12-02 06:42:58 +00:00
Jack He
33f0cf1267 Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile"
am: 7dd909684f

Change-Id: Ib90b23ef7b4271e2adc8a3c66963aaeb5c70a66f
2016-12-02 04:49:39 +00:00
Treehugger Robot
7dd909684f Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile" 2016-12-02 04:37:52 +00:00
Mark Salyzyn
de04a0480a Merge "jni: EventLog replace open coding with android_log_event_list"
am: 1981812450

Change-Id: Ia6a4daf5b90ef20d227e06c9322a84ed7d3bb8aa
2016-12-02 03:44:33 +00:00
Robert Greenwalt
2232ac8c59 Merge "Get the correct operator name"
am: 297e9f9a32

Change-Id: Ic4c433e9b7e70427275fbbba785bb365e0ced8d5
2016-12-02 03:39:30 +00:00
Jack He
1ac34e3657 Protect broadcast emitted by Bluetooth mapmce and pbap profile
Bug: 33281228
Test: mm -j 40
Change-Id: I273e9e3c02f431ba7006bcf5d230a6c30eb67843
2016-12-01 18:55:31 -08:00
Etan Cohen
0ae58fa665 [AWARE] Fix javadocs for match filter update
Javadocs update. Specifically, cannot contain generics (since
under-the-hood generics are just the undecorated class).

Bug: 32840891
Test: generated docs (no functional change)
Change-Id: I4bc2967a60ad27d137fd5a4dd3db18625343c910
2016-12-01 16:59:41 -08:00
Treehugger Robot
1981812450 Merge "jni: EventLog replace open coding with android_log_event_list" 2016-12-02 00:39:55 +00:00
Robert Greenwalt
297e9f9a32 Merge "Get the correct operator name" 2016-12-01 23:29:28 +00:00
Zoran Jovanovic
47495ebad0 Get the correct operator name
If the long operator name is not given by RIL,
try to get the short operator name.

Bug: 32791744
Merged-In: I4983ad708c57a650ce4a806e1f53837825bad2db
Depends-On: commit in frameworks/opt/telephony with the same Change-Id
Change-Id: I4983ad708c57a650ce4a806e1f53837825bad2db
2016-12-01 21:50:14 +00:00
ltrochtova
834725f579 Merge "Revert "Introduce a new user restriction for disallowing Bluetooth.""
am: 4eb075e89f  -s ours

Change-Id: Ibcc0b6db64260f444c5884ce9df39395d59a6158
2016-12-01 21:48:07 +00:00
Michael Rosenfeld
3711f2f0c2 Merge "Add command line action sequencing."
am: 880c9acf4a

Change-Id: I81b31d950e0dca525fbfe9aa38c9c113eea7cec8
2016-12-01 21:40:06 +00:00
Etan Cohen
7f12aa5470 Merge "AWARE: Abstract structure of match filters"
am: f358a69cba

Change-Id: Ic7e87e47e9a9beebb11aa7465e4d2be9dd3e767a
2016-12-01 21:35:05 +00:00
ltrochtova
0a21ba22e3 Merge "Introduce a new user restriction for disallowing Bluetooth."
am: 1e9a5eac92  -s ours

Change-Id: I35d19d46b8edbacb66613e11a398c742f9d37029
2016-12-01 21:31:23 +00:00
ltrochtova
4eb075e89f Merge "Revert "Introduce a new user restriction for disallowing Bluetooth."" 2016-12-01 21:20:43 +00:00
ltrochtova
8874fcf97f Revert "Introduce a new user restriction for disallowing Bluetooth."
This reverts commit 69f9d321ac.

Change-Id: I5859b262a741d1fe8e8b61e142eecf7d742d8d41
2016-12-01 20:50:53 +00:00
Yifan Hong
bae1b55ae0 Use IBase instead of IBinder for IServiceManager.
Test: compiles with mma
Change-Id: I5805df48aa358dcef555125f6467d659f095b0c2
2016-12-01 10:25:05 -08:00
Treehugger Robot
880c9acf4a Merge "Add command line action sequencing." 2016-12-01 17:23:37 +00:00
Etan Cohen
f358a69cba Merge "AWARE: Abstract structure of match filters" 2016-12-01 15:42:35 +00:00
ltrochtova
1e9a5eac92 Merge "Introduce a new user restriction for disallowing Bluetooth." 2016-12-01 13:40:29 +00:00
Lenka Trochtova
69f9d321ac Introduce a new user restriction for disallowing Bluetooth.
Only the device owner will be able to set the restriction
and the restriction will prevent usage of Bluetooth on
the  entire device - i.e. in all the users.

Test: cts-tradefed run cts -m  CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.UserRestrictionsTest
Test: cts-tradefed run cts -m  CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction

Bug: 32895300

Change-Id: Iae77647b1e48be6b8efbeccdff6a3d468a0e174d
2016-12-01 10:56:51 +01:00
Stephen Chen
dfd9942a31 Merge "Add meteredOverride field to WifiConfiguration."
am: f9479fe639

Change-Id: I0d2540cf0a360f07c1dd103191fd348602099ff5
2016-12-01 03:23:32 +00:00
Treehugger Robot
f9479fe639 Merge "Add meteredOverride field to WifiConfiguration." 2016-12-01 03:08:44 +00:00
Andreas Gampe
0662cd5de8 Merge "App_process: Merge app_process and app_process__asan"
am: de32925ccd

Change-Id: I86aaea459fdc1283a3b7e2f0b035ad26aef98920
2016-12-01 02:48:18 +00:00
Treehugger Robot
de32925ccd Merge "App_process: Merge app_process and app_process__asan" 2016-12-01 02:38:29 +00:00
Stephen Chen
8ca96c1f3c Add Settings.Global.WIFI_WAKEUP_ENABLED flag.
Set the flag default to false. This addition is for the
Android Wi-Fi Snooze project:
https://docs.google.com/document/d/1zewDZ6Ne-qH7zKFDtcSx55f9jPauZwT5VvOs1uVNXf8/edit#

Bug: 32920000
Bug: 32913119
Test: runtest --path
frameworks/base/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderTest.java

Change-Id: I597d5dd643e8044315cc6d7553ae5740485a0552
2016-11-30 18:31:44 -08:00
Amin Shaikh
a8fc97d2de Merge "Refactor NetworkScoreAppManager for testing."
am: 3af97482f1

Change-Id: I99537b7841021704c162db6b8fe3d472ede1e991
2016-12-01 02:10:55 +00:00
pengzhicai
acaed3d29e Fix the deadlock problem
https://code.google.com/p/android/issues/detail?id=229020

Change-Id: Ib08f62dd916d09e666e58fb583555170d1e51da6
Signed-off-by: pengzhicai <pengzhicai@xiaomi.com>
2016-12-01 02:01:49 +00:00
Treehugger Robot
3af97482f1 Merge "Refactor NetworkScoreAppManager for testing." 2016-12-01 01:59:14 +00:00
Jaekyun Seok
377878b4d4 Remove static link in Android framework under /frameworks/base.
The dependencies to static libraries in frameworks should be removed
as many as possible to reduce a size of the system partition.
And that will improve coverage of the VNDK libraries because this
effort might find new necessary shared libs which were linked
statically before.

Size diffs of libs in /system/lib on angler-userdebug build are as
following.

libandroidfw.so      : 243748 -> 205196 (-38552)
libhwui.so           : 562028 -> 562580 (+552)
libmedia_jni.so      : 293652 -> 293656 (+4)
(All the others have the same size.)

total: (-37996)

Test: building succeeded, and the image was tested on angler.
Bug: 33056637
Change-Id: I3021fb438778eaea2be935b990ec85c4aec6c008
(cherry picked from commit 2b14c5eaf6)
2016-12-01 10:31:12 +09:00
Etan Cohen
1857b982c3 AWARE: Abstract structure of match filters
Replace byte[] representation with a List<byte[]> representation
which abstracts the LV (TLV without a type field) structure of
the match filters.

Tlv utilities: remove tag indicating that will be made public API.
That is no longer expected (will be an internal utility) since the
match filter structure is now parsed when exposed to API.

Lv utilities: removed. Was a simple wrapper around Tlv utilities -
no longer needed since will not be exposed as API.

(cherry-pick of commit c9870d0d431471bf1362e46fc4f2f1bc6722896a)

Bug: 32840891
Test: unit-tests and integration (sl4a) tests passing
Change-Id: I6d792c4d7584ce002f6c11692e83e7654ef3e764
2016-11-30 17:01:52 -08:00
Andreas Gampe
2200e09736 App_process: Merge app_process and app_process__asan
Two birds with one stone: simplify the setup (including the modules
required in PRODUCT_PACKAGES) and work around a build system issue
wrt/ sanitized static libraries.

Bug: 33224213
Test: mmma frameworks/base/cmds/app_process && \
      mmma SANITIZE_TARGET=address SANITIZE_LITE=true \
      frameworks/base/cmds/app_process && \
      ls $OUT/system/bin/asanwrapper && \
      readelf -s $OUT/system/bin/app_process32 | grep asan && \
      readelf -s $OUT/system/bin/asan/app_process32 | grep asan && \

Change-Id: Ieff0ea9a2209cf74cf06f813087b55cb0bcc3896
2016-11-30 16:35:32 -08:00
Andreas Gampe
c07a430722 Merge "App_process: Clean up sanitized binaries"
am: 273adb5257

Change-Id: I83ec3dd0ad23844cc9ba3420bc43b9b8deb3d1ca
2016-12-01 00:09:00 +00:00
Glenn Kasten
25889e4d6c Merge "LOCAL_CLANG := true is now the default"
am: 1204e3806f

Change-Id: Id579bdea109bca2056cea6c0359e18b120801bf4
2016-12-01 00:06:49 +00:00
Stephen Chen
6ef2ec0d80 Merge "Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings."
am: 6e54c31f0a

Change-Id: Ie3b4a3ed5e2858ce2b3446c300c984875201205c
2016-12-01 00:02:58 +00:00
Robert Greenwalt
2b5a69cb6f Merge "Fix MSIM issue of broadcast intent overwritten unintentionally"
am: fbb48bcecd

Change-Id: I7a1c9a20e5f4f9f051926294650fcf9d486d4703
2016-12-01 00:01:04 +00:00
nharold
8fabfd639e Merge "Expose GSM Timing Advance, Update LTE TA docstring"
am: 4134ccb214

Change-Id: Ic60953cebd3209b1320ed4b6723809d0421ebc27
2016-12-01 00:00:09 +00:00