Commit Graph

301953 Commits

Author SHA1 Message Date
Bartosz Fabianowski
b272e91202 Merge "Link from Quick Settings to Enterprise Privacy page" 2016-12-06 15:09:31 +00:00
Treehugger Robot
5014028691 Merge "Check for nullptr when casting IBinder to IBase." 2016-12-06 15:08:40 +00:00
TreeHugger Robot
483df5621d Merge "Fix bug in GnssLocationProvider." 2016-12-06 14:51:52 +00:00
Paul Duffin
9249205d1b Replace core-junit with junit
Bug: 30188076
Test: make checkbuild
Change-Id: I0cb6f89907eb099714b54bac57b51c4be186c3e0
2016-12-06 14:32:41 +00:00
TreeHugger Robot
3cf4b56a92 Merge "Add libziparchive explicitly." 2016-12-06 14:08:45 +00:00
Andrei Stingaceanu
fdfb9859cd Merge "AutoSize TextView (part 3) - define who supports autosize" 2016-12-06 13:21:00 +00:00
Andrei Stingaceanu
5038d58c83 AutoSize TextView (part 3) - define who supports autosize
Introduces a new protected hidden method that
specifies if the TextView (or descendant) widget
supports the autosize feature. All direct children of
TextView (besides EditText) support it.

Bug: 33098425
Bug: 32221168
Test: attached in the topic

Change-Id: I6f0092b4c9948afb427fe597b0515a39b1f258f6
2016-12-06 13:14:22 +00:00
Michal Karpinski
6f61556fc2 Merge changes from topic 'netd-benchmark-and-logging-nyc-mr2-dev' into nyc-mr2-dev am: b97196b1de
am: 41313f60aa

Change-Id: I3741cea61e253aaa15511be1be804469e761f81d
2016-12-06 11:53:53 +00:00
Michal Karpinski
a78d403d6f DO NOT MERGE Add connect event reporting am: c429e71cfe
am: 37012db6d0  -s ours

Change-Id: Ia41d506de553869203e4e0c45530f8c62364f2f8
2016-12-06 11:52:26 +00:00
Michal Karpinski
6cfbc47bac DO NOT MERGE Extending DNS event reporting am: 70444d3ad5
am: bea60201f3  -s ours

Change-Id: Icd67ff044613a33d938f6c21b8a19e95c06c05aa
2016-12-06 11:51:24 +00:00
Bill Yi
25e686ed27 Import translations. DO NOT MERGE
Change-Id: I2e4b98dd89aea3f467b999027dd0b3f330fdcd18
Auto-generated-cl: translation import
2016-12-06 03:44:40 -08:00
Michal Karpinski
41313f60aa Merge changes from topic 'netd-benchmark-and-logging-nyc-mr2-dev' into nyc-mr2-dev
am: b97196b1de

Change-Id: Iadfe22122e0d449991c5f0e29f2882dafb6de64f
2016-12-06 11:42:11 +00:00
Michal Karpinski
37012db6d0 DO NOT MERGE Add connect event reporting
am: c429e71cfe

Change-Id: I0b81691ceb4d72f448a26e9ac1233a3bc89cc14e
2016-12-06 11:41:22 +00:00
Michal Karpinski
bea60201f3 DO NOT MERGE Extending DNS event reporting
am: 70444d3ad5

Change-Id: Iaccaa3697f14ef111985c87ecbad3b9af81a0760
2016-12-06 11:40:23 +00:00
Narayan Kamath
988149c925 PackageParser: Add support for caching parse results on the file system.
The exact scheme for serializing parse results is left undefined, and
will be implemented in a follow-up change.

Also adds a unit test for this functionality.

Test: PackageParserTest
Bug: 30792387

Change-Id: I5be6a3f97b5688d0a1aa9e024e946d590ad92c13
2016-12-06 11:35:18 +00:00
Bill Yi
996f5c95a0 Import translations. DO NOT MERGE
Change-Id: I336be133ac6cfae27371dabc43273ffdf34073bf
Auto-generated-cl: translation import
2016-12-06 03:09:21 -08:00
Yoshinori Hirano
7bccd43fa9 Don't include front most excluded task in Multi-Window mode
A front most excluded task is shown on Overview when changing font size
in Multi-Window mode. To fix this issue, RecentActivity should not reset
the config launch flags when it is restarted by configuration changes and
it should not reload the tasks which include a front most excluded task
when it is launched while docking a task.

Bug: 33031985
Test: manual - display app task excluded from Overview screen and then
               change font size in Multi-Window mode

Change-Id: Ic0c35cd06c14d9ed8d2dc46a01f2153738bad849
2016-12-06 19:48:21 +09:00
Bill Yi
fd3dcd4154 Import translations. DO NOT MERGE
Change-Id: Ief52b6f1c9f2cd252342de908f3c323103fa7090
Auto-generated-cl: translation import
2016-12-06 02:44:10 -08:00
Michal Karpinski
b97196b1de Merge changes from topic 'netd-benchmark-and-logging-nyc-mr2-dev' into nyc-mr2-dev
* changes:
  DO NOT MERGE Add connect event reporting
  DO NOT MERGE Extending DNS event reporting
2016-12-06 10:16:37 +00:00
Michal Karpinski
803abe7378 Merge "Unhiding network logging API" 2016-12-06 09:54:14 +00:00
Mahaver Chopra
abf86385f8 Merge "Return error code from isProvisioningAllowed" 2016-12-06 09:45:05 +00:00
Bartosz Fabianowski
46bea2e685 Link from Quick Settings to Enterprise Privacy page
This CL updates the information shown in Quick Settings when a device
is managed by a Device Owner and adds a "learn more" link that takes
the user to the Enterprise Privacy page in Settings.

Bug: 32692748
Bug: 25779452
Test: runtest --path frameworks/base/packages/SystemUI/tests &
      runtest --path frameworks/base/core/tests/coretests

Change-Id: I8cbb6f2bb5c6da29ae581b6dcf7a01b1a4f2af2b
2016-12-06 08:13:30 +01:00
TreeHugger Robot
6d62b033e0 Merge "AAPT2: Allow <meta-data> in <manifest>" 2016-12-06 06:54:29 +00:00
Jeff Sharkey
c8ddc2d56e Move moveCompleteApp() to Binder.
Also start manually checking thread-locking, since Binder methods
don't funnel through the old transact().

Test: builds, boots, apps install fine
Bug: 13758960, 30944031
Change-Id: I661eade7dc8e060689ecbcb9b6d19528e5c4ca66
2016-12-05 23:41:04 -07:00
Adam Lesinski
5119e51730 AAPT2: Allow <meta-data> in <manifest>
Bug:32171613
Test: libaapt2_tests
Change-Id: I30fdd9475ff7dff6ceb0ff46a4a00991b72db68b
2016-12-05 21:09:52 -08:00
TreeHugger Robot
598e9a7f41 Merge "Prevent orphaning of windows when token is removed" 2016-12-06 04:52:35 +00:00
TreeHugger Robot
821447a3be Merge "Make tests use APKs instead of exploded APKs" 2016-12-06 04:33:47 +00:00
Hridya Valsaraju
e8650320c5 Fix bug in GnssLocationProvider.
Perform nullptr checking correctly before calling setCallback()
on gnssXtraIface.

Bug: 33334137
Test: Checked no crash happens when GNSS HAL returns a null
GnssXtraInfc.

Change-Id: I763d96443a0a6c0f036ecfc86ac442b297560efa
2016-12-05 20:30:45 -08:00
Bill Yi
7ac0f94c29 Import translations. DO NOT MERGE
Change-Id: I7d9c8c76cfa1c08c80bc7ee496b5de5a491e2e47
Auto-generated-cl: translation import
2016-12-05 20:29:51 -08:00
Adam Lesinski
4c67a475a3 Make tests use APKs instead of exploded APKs
Tests would expect parts of the APK to be unzipped and
maintained. Instead, we now decompress the required files
from the test APKs on test setup. This simplifies
test maintenance substantially.

Test: make libandroidfw_tests && libandroidfw_tests --testdata=frameworks/base/libs/androidfw/tests/data
Change-Id: I3d2100af22df913e02401dedcf9842cdb32b2a3b
2016-12-05 19:03:47 -08:00
Ned Burns
05bcd46951 Merge changes from topic 'am-0afb48b1e7264a0a939ebf26aaf8e5f0' into nyc-mr2-dev-plus-aosp
am: f0893b68ad

Change-Id: I0ef786be68587613afeac94a4b59ee23ce66d2bc
2016-12-06 02:59:22 +00:00
Hugo Benichi
80df43ea8a Fix IP connectivity metrics tests
So that test assumptions match previous changes in ipconnectivity.proto.

This patch also tags metrics tests with @SmallTest.

Test: $ runtest frameworks-net
Bug: 32561414
Bug: 32198976
Change-Id: Id58baf6eb9ddf0e10266e9150cb7688dd3136953
2016-12-06 11:56:23 +09:00
Hugo Benichi
7c3a786921 IP connectivity metrics: introduce ConnectStatistics and DNS statistics
This patch introduces a ConnectStatistics message for collecting
Android devices connect() statistics.

It also changes DNS latency events to be grouped by (query_type,
query_return_value) to optimize space usage. For this purpose, a new
DNSLookupLatencies message is introduced and DNSLookupBatch is
deprecated. New counter fields are added for the number of queries,
and number of responses with A and AAAA records.

Test: manually taking a diff with reference ipconnectivity.proto
Bug: 32198976
Change-Id: I6cccd539d2c3d703f2d6eb0c56f54cdcc1631a6c
2016-12-06 11:56:23 +09:00
Hugo Benichi
807124a7f5 IP connectivity metrics: add transport field.
This patch adds a transport field dimension to IpConnectivityEvent for
replacing interface name, and eventually network ids.

At the moment the transport field is not populated.

Test: manually taking a diff against reference ipconnectivity.proto
Bug: 32198976
Change-Id: Ia66cabda0b08076c87dc83c4f6ff98581f750884
2016-12-06 11:56:23 +09:00
Ned Burns
a2f84fc0e1 Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev am: 3601d3c239 am: ca8412c316
am: 648a8b1c05

Change-Id: Ic6cd158edec575d52ac2dc34dc874b102d94ec1a
2016-12-06 02:53:44 +00:00
Ned Burns
27b6b104dd Modify SwipeDismissLayout to perform its own exit animation am: 7d6cb913de am: 081fd25237
am: 94c2bf7bd9

Change-Id: Ib09e3bb0b581598adfb2a336fd6aa9804434e977
2016-12-06 02:52:36 +00:00
Ned Burns
a6fe3e2fd9 Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev am: 3601d3c239 am: f59d4e0a82
am: 530e236ad6

Change-Id: If15a0b77b72300f58eb7bb0c7fe6f63c82e8c1ba
2016-12-06 02:49:24 +00:00
Ned Burns
df1710dc6e Modify SwipeDismissLayout to perform its own exit animation am: 7d6cb913de am: f9566827f2
am: 768f62aac1

Change-Id: Ibe1a8b9a7cf71b715ae7d4e0157b5cdf1d52e81d
2016-12-06 02:48:01 +00:00
Android Build Merger (Role)
f0893b68ad Merge changes from topic 'am-0afb48b1e7264a0a939ebf26aaf8e5f0' into nyc-mr2-dev-plus-aosp
* changes:
  Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev am: 3601d3c239 am: ca8412c316
  Modify SwipeDismissLayout to perform its own exit animation am: 7d6cb913de am: 081fd25237
2016-12-06 02:42:00 +00:00
Ned Burns
648a8b1c05 Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev am: 3601d3c239
am: ca8412c316

Change-Id: I7b1eb7a617a5a0820cb4431daedbb9abf5b7777b
2016-12-06 02:40:23 +00:00
Ned Burns
530e236ad6 Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev am: 3601d3c239
am: f59d4e0a82

Change-Id: I252049cd012a3ea0b07ea85468d57c193178264b
2016-12-06 02:39:53 +00:00
Ned Burns
94c2bf7bd9 Modify SwipeDismissLayout to perform its own exit animation am: 7d6cb913de
am: 081fd25237

Change-Id: Id468ea0b13767263eb005bdefac99806fb2211dc
2016-12-06 02:39:03 +00:00
Ned Burns
768f62aac1 Modify SwipeDismissLayout to perform its own exit animation am: 7d6cb913de
am: f9566827f2

Change-Id: I157e10afa6b8c0414c2af25d98bf5913928925f2
2016-12-06 02:38:47 +00:00
Michael Kwan
7dbbf956f7 Merge "Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev am: 7f2554cfb7 am: e384a782e0" into nyc-mr2-dev-plus-aosp
am: 56739549fe

Change-Id: I1cbf407213dce91893704cce3abb04a222a16809
2016-12-06 02:37:59 +00:00
Michael Kwan
9872971503 Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev am: 7f2554cfb7 am: e384a782e0
am: 042c1b8d3c

Change-Id: Iab854a52d63c2dbfe811290c2d8c550cb5bd63ef
2016-12-06 02:37:51 +00:00
Ned Burns
ca8412c316 Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev
am: 3601d3c239

Change-Id: I06edeb142fe780a80e679d08c0c8bf463737277b
2016-12-06 02:33:42 +00:00
Ned Burns
f59d4e0a82 Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev
am: 3601d3c239

Change-Id: I1ec2e39a533dcd6aefc5cd337be1be45b1a75dff
2016-12-06 02:33:28 +00:00
Ned Burns
081fd25237 Modify SwipeDismissLayout to perform its own exit animation
am: 7d6cb913de

Change-Id: Ie9784fa9b7c878371f1e12acbb362b36fc66e023
2016-12-06 02:33:23 +00:00
Ned Burns
f9566827f2 Modify SwipeDismissLayout to perform its own exit animation
am: 7d6cb913de

Change-Id: I17d086e1c24d9eb91a984c45b88f529006465d34
2016-12-06 02:33:13 +00:00
Michael Kwan
ff12251e50 Merge "Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev am: 7f2554cfb7 am: 615bda5be9" into nyc-mr2-dev-plus-aosp
am: 3a46ce8a89

Change-Id: If1bcc9baef33863b94b51dda7d44d4098f6bcbc3
2016-12-06 02:32:33 +00:00