Commit Graph

393780 Commits

Author SHA1 Message Date
Annie Meng
df70906e80 Update B&R owners
Owners source of truth is now in AOSP but has merge conflicts with
internal so submitting a separate CL here (AOSP change at
aosp/813915).

Test: N/A
Change-Id: I0e96914bb339874a30c80776596f2d84e508df85
2018-11-29 15:55:12 +00:00
TreeHugger Robot
de93099a38 Merge "Fix translateable -> translatable in .xml files" 2018-11-23 16:34:51 +00:00
Neil Fuller
70ffd663aa Fix translateable -> translatable in .xml files
Fix translateable -> translatable in .xml files. The attribute
must be correctly named to influence behavior.

Bug: 119884572
Bug: 119941330
Test: build only
Change-Id: I59b17e914f90cab495c1e7be3c14b0423da73b43
2018-11-23 16:02:03 +00:00
TreeHugger Robot
457333a54a Merge "Add a new getPackageInfoAsUser as a SystemApi." 2018-11-23 15:05:59 +00:00
Marcin Oczeretko
8e90ada67e Merge "LooperStats - add debug entries to output for data validation" 2018-11-23 14:11:40 +00:00
Chandan Nath
0961c3e61f Merge "add option --user to Bmgr.java" 2018-11-23 10:51:24 +00:00
Sungsoo Lim
96a62ff0a1 Merge "Remove SessionToken2Provider" 2018-11-23 00:09:27 +00:00
Rafal Slawik
062213b733 Merge "Temporarily exclude zygote" 2018-11-22 18:18:12 +00:00
TreeHugger Robot
36f7827a9d Merge "Restrict unsupported usage of Linear/RelativeLayout APIs" 2018-11-22 18:17:21 +00:00
Abodunrinwa Toki
d531f70d30 Merge "ConversationActions Config installer." 2018-11-22 16:02:54 +00:00
Clara Bayarri
6036858696 Restrict unsupported usage of Linear/RelativeLayout APIs
These internal accesses can be done by existing public API

Bug: 117521217, 117521667
Test: make
Change-Id: I31116551f6e5a4f8c84a811f62419302fee91c2c
2018-11-22 15:17:54 +00:00
Nicholas Sauer
a46113a5f0 Merge "settings command list by user" 2018-11-22 15:12:08 +00:00
Rafal Slawik
0f93bab4bd Temporarily exclude zygote
zygote is excluded from NativeProcessMemoryState to investigate whether
the unexpected values reported in the atom are due to its forking.

Test: atest UidAtomTests#testNativeProcessMemoryState
Change-Id: I9e29955d9931ac19c49d0ee18a5245a40034486f
2018-11-22 12:54:43 +00:00
David Brazdil
509d06a641 [automerger skipped] Merge "Create AppComponentFactory.instantiateClassLoader API" am: 67c6ab38ba am: 060ec73ff2
am: 7149b1e88c  -s ours

Change-Id: I80a0a28cd3e6f4c6cc4c527c6c8388db24f636dd
2018-11-22 04:15:02 -08:00
David Brazdil
7149b1e88c Merge "Create AppComponentFactory.instantiateClassLoader API" am: 67c6ab38ba
am: 060ec73ff2

Change-Id: I7c9f5fa3a9b1992b79cb26f77d03fddbf1ec6ff2
2018-11-22 03:50:07 -08:00
Tiger Huang
3d373af66d Merge "Let System UI show on external displays (1/3)" 2018-11-22 11:44:05 +00:00
David Brazdil
060ec73ff2 Merge "Create AppComponentFactory.instantiateClassLoader API"
am: 67c6ab38ba

Change-Id: I8f90b1ae29bad3ba5c3ceb024bee195fc084d387
2018-11-22 03:31:05 -08:00
TreeHugger Robot
c61363e7a2 Merge "Add detectLanguage and suggestConversationActions to TCS" 2018-11-22 11:16:30 +00:00
David Brazdil
67c6ab38ba Merge "Create AppComponentFactory.instantiateClassLoader API" 2018-11-22 11:09:15 +00:00
David Brazdil
eaba86819f Merge "Update public API after libcore InMemoryDexClassLoader change" am: a21de6f376 am: e8fdc7a52a
am: e3ec08d1ae

Change-Id: Iea58dbf279d6623040f43a2d8dc27b8a253626d8
2018-11-22 02:55:42 -08:00
David Brazdil
e3ec08d1ae Merge "Update public API after libcore InMemoryDexClassLoader change" am: a21de6f376
am: e8fdc7a52a

Change-Id: I68034e435ce47caf2dd5bbf1f57af0b889b4fd55
2018-11-22 02:42:23 -08:00
David Brazdil
e8fdc7a52a Merge "Update public API after libcore InMemoryDexClassLoader change"
am: a21de6f376

Change-Id: I90b801cee1d6cb965fedf2e029f01365aac87887
2018-11-22 02:25:38 -08:00
Nicolas Geoffray
850f109ec8 Merge "Start using shared libraries class loader." 2018-11-22 10:24:38 +00:00
David Brazdil
a21de6f376 Merge "Update public API after libcore InMemoryDexClassLoader change" 2018-11-22 10:09:19 +00:00
Nicolas Geoffray
8d144eb8bd Start using shared libraries class loader.
Change 1/2. Change 2/2 will setup the class loader namespace for
shared libraries.

This change sets up shared libraries class loaders for applications
and for dexopt.

bug: 111174995
Test: DexoptUtilsTest, device boots

Change-Id: Ie9a2b4eaa85cda59951703433f7a2d03bc12095d
2018-11-22 10:06:41 +00:00
Tiger Huang
7c610aaab3 Let System UI show on external displays (1/3)
Let each display have one status bar and one navigation bar. This is
so on each display, status bar and navigation bar can be laid out with
apps and produce proper insets.

Bug: 117474929
Test: atest com.android.server.wm
Test: Watch YouTube video in fullscreen mode, and see if status bar
      and navigation will be hidden as expected. Swipe on the edge
      of screen and see if status bar and navigation bar are both
      shown as expected.

Change-Id: I1550659b7cd1dd1676bf04483c5b68376ef42905
2018-11-22 17:58:06 +08:00
TreeHugger Robot
5c4f214953 Merge "Fix unable to resume activity with dismiss-keyguard flag" 2018-11-22 09:37:12 +00:00
TreeHugger Robot
9fa0710c66 Merge "Fix vmalloc memory usage parsing." 2018-11-22 09:35:30 +00:00
Neil Fuller
f58e10d979 Merge "Track move of timezone classes to libcore.timezone" 2018-11-22 09:31:19 +00:00
Neil Fuller
164394db8e Track move of timezone classes to libcore.timezone
Some time zone related libcore classes are moving from
libcore.util to libcore.timezone.

Bug: 119026403
Test: build only
Exempt-From-Owner-Approval: Trivial import change
Change-Id: Ie90c219799cbf9601a22a2d972c09e3d94fc0c43
2018-11-22 09:31:04 +00:00
Sungsoo Lim
0b69021d93 Merge "Fix AudioAttributes.setContentType" 2018-11-22 07:01:59 +00:00
Sungsoo Lim
9381adfbd4 Remove SessionToken2Provider
Bug: 119591238
Test: build
Change-Id: I71be4db9f0f7f245e8d8d04ca3400320b623a47a
2018-11-22 14:53:35 +09:00
Chen Xu
fe202b92c4 [automerger skipped] Merge "integrate carrier id to carrier config" am: cc37384e58 am: 9a93149dab
am: f54b45c68b  -s ours

Change-Id: I4ea12702bd8da6eb74394c2bda0ae7316bbae7ed
2018-11-21 21:43:37 -08:00
Chen Xu
f54b45c68b Merge "integrate carrier id to carrier config" am: cc37384e58
am: 9a93149dab

Change-Id: If10abd107b6cf8f07819993fdcbee58328034ab3
2018-11-21 21:32:11 -08:00
Chen Xu
9a93149dab Merge "integrate carrier id to carrier config"
am: cc37384e58

Change-Id: I9060c668742be6698674b85e92f7bb6b8450dfbf
2018-11-21 21:22:58 -08:00
Chen Xu
cc37384e58 Merge "integrate carrier id to carrier config" 2018-11-22 05:06:55 +00:00
Sungsoo Lim
00d0bb3818 Fix AudioAttributes.setContentType
Test: build
Change-Id: Icfafeb3069010bf73c3d3e00f19c62c5fbf0e437
2018-11-22 13:51:53 +09:00
TreeHugger Robot
e9e01e2cfe Merge "Remove unused Media 2.0 APIs" 2018-11-22 02:13:39 +00:00
chen xu
d95965ae1b integrate carrier id to carrier config
add carrierId and preciseCarrierId in CarrierIdentifier
which will be passed to carrier service to decide which carrier
info to look up

Bug: 110559381
Change-Id: I1b4a44dd32148ebdf5aa437c5938cb89656c27c2
Merged-in: I1b4a44dd32148ebdf5aa437c5938cb89656c27c2
2018-11-21 17:29:43 -08:00
Chen Xu
ecfc941500 Merge "integrate carrier id to carrier config" 2018-11-22 01:22:23 +00:00
Wei Sheng Shih
c3d0cd4b0c Merge changes from topic "wallpaper_to_displays"
* changes:
  Support wallpaper on secondary displays.(2/N)
  Support wallpaper on secondary displays.(1/N)
2018-11-22 01:14:24 +00:00
Gustav Sennton
fa830752aa Merge "Add smart actions to message notifications." 2018-11-22 00:58:46 +00:00
TreeHugger Robot
0a889e3fc6 Merge "Replace HashMap with ArrayMap in IMMS and InputMethodUtils" 2018-11-22 00:35:19 +00:00
TreeHugger Robot
14c651bb7b Merge "Notify AutofillManager in onResume() IFF activity was not recreated." 2018-11-21 23:57:15 +00:00
TreeHugger Robot
b08ce064b7 Merge "Fix TaskRecordTests#testRestoreWindowedTask serialization test" 2018-11-21 23:49:35 +00:00
Joel Galenson
ad219787cc Add a new getPackageInfoAsUser as a SystemApi.
This is needed so the PermissionController can differentiate between
multiple versions of the same app.

Bug: 119811056
Test: Call API.
Change-Id: I19150e1c8e5f204a846500cfe0021da742235213
2018-11-21 15:25:17 -08:00
Janis Danisevskis
a258be6742 Merge "Fix deleting legacy key blobs" am: c24a4b5f44 am: b3c61fac5f
am: 4d8a0decdb

Change-Id: I74ba06e7371696806a8ab1adbd7e65d806e208c4
2018-11-21 15:15:17 -08:00
Janis Danisevskis
4d8a0decdb Merge "Fix deleting legacy key blobs" am: c24a4b5f44
am: b3c61fac5f

Change-Id: I90950d0ecd4b5995ae513ed343f4d8b250183ff5
2018-11-21 15:06:01 -08:00
Andreas Gampe
bec8b4d1b7 Merge "Framework: Remove some methods from boot image profile" am: b896d4fa3b am: 7d2ae7480f
am: deadb0cbbb

Change-Id: Id2307673c82a0fcaf4dee53aa880de61137f3e02
2018-11-21 15:03:57 -08:00
Sandeep Patil
d70e20218a Fix vmalloc memory usage parsing.
The size in /proc/vmallocinfo actually represents the size of
the virtual region and not the size of memory allocated for the same.
So, we have been over counting vmalloc memory usage in most cases
leading into negative "Lost RAM".

Moreover, as of kernel 4.14, binder allocations that were ignored before
are now counted as vmalloc allocations since binder started using the
'vmalloc' flag instead of 'ioremap' flag for its vm area allocations.

  See: 86eda3864a

.. This makes the problem even worse for devices that are running
kernel 4.14 and beyond.

Fix that by looking specifically for "pages=" in each line of
/proc/vmallocinfo to get the number of physical pages associated with
the particular allocation.

Bug: 119639955
Test: 'dumpsys meminfo' before and after on cuttlefish running 4.14 kernel.
Result:
  Lost RAM (before) : -151,462K
  Lost RAM (after) : -5,312K

Change-Id: I3d677572613392383ee8ea0968bde0e0913c42cf
Signed-off-by: Sandeep Patil <sspatil@google.com>
2018-11-21 14:51:20 -08:00