OSDN Git Service
Narayan Kamath [Fri, 8 Jan 2016 09:44:34 +0000 (09:44 +0000)]
Merge "Trivial correction of Camera2 API description"
am:
a909dad0c3
* commit '
a909dad0c36542ffbc155f98b4eb054921b1bbd0':
Trivial correction of Camera2 API description
Narayan Kamath [Fri, 8 Jan 2016 09:39:21 +0000 (09:39 +0000)]
Merge "Fixed calendar fields comparison"
am:
9aeb6edf55
* commit '
9aeb6edf5518a839156de7aab808a75a8fd6843b':
Fixed calendar fields comparison
Narayan Kamath [Fri, 8 Jan 2016 09:36:14 +0000 (09:36 +0000)]
Merge "Trivial correction of Camera2 API description"
Narayan Kamath [Fri, 8 Jan 2016 09:30:41 +0000 (09:30 +0000)]
Merge "Fixed calendar fields comparison"
Philipp Hasper [Thu, 25 Jun 2015 10:10:01 +0000 (12:10 +0200)]
Fixed calendar fields comparison
Month was compared with the day and vice versa.
Found by dukejeffrie.
Change-Id: Ic4efca440c408325819ff1df85db7b407cf3207e
Hidenari Koshimae [Fri, 8 Jan 2016 07:18:28 +0000 (16:18 +0900)]
Trivial correction of Camera2 API description
Change-Id: Ibb3393b94812dfe7b496182bb5ef43f1a5df7434
Stephen Hines [Thu, 7 Jan 2016 22:05:13 +0000 (22:05 +0000)]
Merge "Remove graphics-related RenderScript tests."
am:
766e20506c
* commit '
766e20506c85fef052b3dec668c079a1ad9b9eb2':
Remove graphics-related RenderScript tests.
Stephen Hines [Thu, 7 Jan 2016 21:57:21 +0000 (21:57 +0000)]
Merge "Remove graphics-related RenderScript tests."
Alex Klyubin [Thu, 7 Jan 2016 19:18:01 +0000 (19:18 +0000)]
Merge "[1/3] Remove unnecessary throws statement in ServiceManager"
am:
d1240219aa
* commit '
d1240219aadedc867b50158c67d1737a27fa7c6f':
[1/3] Remove unnecessary throws statement in ServiceManager
Alex Klyubin [Thu, 7 Jan 2016 19:08:26 +0000 (19:08 +0000)]
Merge "[1/3] Remove unnecessary throws statement in ServiceManager"
Daniel Sandler [Thu, 7 Jan 2016 18:17:10 +0000 (18:17 +0000)]
Merge "DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm." into mnc-dr1.5-dev am:
c2ec3f1bbe
am:
f61708617c
* commit '
f61708617ca7eb85b81f479fedf7364fff0395d5':
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
Daniel Sandler [Thu, 7 Jan 2016 18:13:07 +0000 (18:13 +0000)]
Merge "DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm." into mnc-dr1.5-dev
am:
c2ec3f1bbe
* commit '
c2ec3f1bbe7271be2126b48fc94acc42a37f43f2':
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
Daniel Sandler [Thu, 7 Jan 2016 18:09:29 +0000 (18:09 +0000)]
Merge "DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm." into mnc-dr1.5-dev
Dan Sandler [Tue, 29 Dec 2015 20:45:39 +0000 (15:45 -0500)]
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
Never attribute to malice that which is adequately explained
by a bug, particularly one involving date math.
Bug:
26326394
Change-Id: I3483ac102c678a8852565c8ea94c06e19b3f26d8
Baligh Uddin [Thu, 7 Jan 2016 16:51:10 +0000 (16:51 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468 am:
4340e0677b am:
aa2210c5c1 am:
78f672ef05 am:
8d85292827 am:
212fe88251 am:
ee895112b3 am:
9530b07c4e
am:
4329dd6a62
* commit '
4329dd6a625e829f0395889586d98bf1523f72ef':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:47:19 +0000 (16:47 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468 am:
4340e0677b am:
aa2210c5c1 am:
78f672ef05 am:
8d85292827 am:
212fe88251 am:
ee895112b3
am:
9530b07c4e
* commit '
9530b07c4e56819e2b5a9ddc7a60feb44e9406c8':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:43:22 +0000 (16:43 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468 am:
4340e0677b am:
aa2210c5c1 am:
78f672ef05 am:
8d85292827 am:
212fe88251
am:
ee895112b3
* commit '
ee895112b3b221062c7093582c9ad98b3bf0bf58':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:39:15 +0000 (16:39 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
71921cb23c am:
6980f76931 am:
a9850abb82 am:
9c43094473
am:
fd023a630a
* commit '
fd023a630af22b60297d36893dff6d5b218a163b':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:39:15 +0000 (16:39 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468 am:
4340e0677b am:
aa2210c5c1 am:
78f672ef05 am:
8d85292827
am:
212fe88251
* commit '
212fe88251a6c769ba71f562fd2f51c30926ccc1':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:35:00 +0000 (16:35 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468 am:
4340e0677b am:
aa2210c5c1 am:
78f672ef05
am:
8d85292827
* commit '
8d8529282719f035d0ce7460ffd640f94d6c6eb8':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:34:59 +0000 (16:34 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
71921cb23c am:
6980f76931 am:
a9850abb82
am:
9c43094473
* commit '
9c430944737a5b73218e4162e81aaada2257603d':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:31:02 +0000 (16:31 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468 am:
4340e0677b am:
aa2210c5c1
am:
78f672ef05
* commit '
78f672ef05d9dbfbd0abf1b29b76f8cb22d84979':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:31:01 +0000 (16:31 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
71921cb23c am:
6980f76931
am:
a9850abb82
* commit '
a9850abb82b0ce7b4319a9b8deb0926f40ab1e70':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:26:49 +0000 (16:26 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468 am:
4340e0677b
am:
aa2210c5c1
* commit '
aa2210c5c174fd681fd52fd43e55de6c018a93ad':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:26:48 +0000 (16:26 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
71921cb23c
am:
6980f76931
* commit '
6980f76931d3a52a2c071b10a5736afe8de0fdf4':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:22:23 +0000 (16:22 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468
am:
4340e0677b
* commit '
4340e0677b691f2ab12549556c23b88e599cf8c1':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:18:11 +0000 (16:18 +0000)]
Fix plurals variable to unblock Translations Pipeline.
am:
61f9f31468
* commit '
61f9f31468c5fc4dd2605c9ab8cb6a54cc58d6f9':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:18:10 +0000 (16:18 +0000)]
Fix plurals variable to unblock Translations Pipeline.
am:
71921cb23c
* commit '
71921cb23c7493ae6c7186d5554233540c9bcc9c':
Fix plurals variable to unblock Translations Pipeline.
Calin Juravle [Thu, 7 Jan 2016 11:52:50 +0000 (11:52 +0000)]
Merge "Create jit profile file during the app startup flow."
am:
5fac913d98
* commit '
5fac913d98eb44269b53cd9cc6a011a4eef3c98d':
Create jit profile file during the app startup flow.
Calin Juravle [Thu, 7 Jan 2016 11:44:55 +0000 (11:44 +0000)]
Merge "Create jit profile file during the app startup flow."
Calin Juravle [Thu, 17 Dec 2015 15:06:49 +0000 (17:06 +0200)]
Create jit profile file during the app startup flow.
ActivityThread has already all the needed information
(userId,sharedAppId) to create the profile file and set the correct
permissions on it. This avoids passing uids to the runtime which now
expects the profile file to be already created.
As part of this change:
- move the registration with the runtim in handleBindApplication
- register only if needed: we could properly setup a profile file and we
have at least one code path. Note that registration with the runtime is
done solely for profiling reasons.
Bug:
26080105
Change-Id: I72657e9ea0a0449a09734456b5f8b5da844cee62
Umair Khan [Wed, 6 Jan 2016 14:17:20 +0000 (19:47 +0530)]
[1/3] Remove unnecessary throws statement in ServiceManager
The exception is already caught by the try-catch block.
Change-Id: I0c10fe51d12a10cbc02a25c719d03a4ba6497767
Signed-off-by: Umair Khan <omerjerk@gmail.com>
Jeremy Joslin [Wed, 6 Jan 2016 21:48:30 +0000 (21:48 +0000)]
Exit getAllValidScorers early if not the primary. am:
5b294b45d0
am:
2a5f880c9e
* commit '
2a5f880c9e3c14c5e3421259f7904d9c352f79dc':
Exit getAllValidScorers early if not the primary.
Jeremy Joslin [Wed, 6 Jan 2016 21:43:24 +0000 (21:43 +0000)]
Exit getAllValidScorers early if not the primary.
am:
5b294b45d0
* commit '
5b294b45d0d7afbed71fd2e59342c5ad7b8b7d76':
Exit getAllValidScorers early if not the primary.
Baligh Uddin [Fri, 30 Jan 2015 15:09:16 +0000 (07:09 -0800)]
Fix plurals variable to unblock Translations Pipeline.
Bug:
19067882
(cherry picked from commit
50d23adfe26bf0cf9a34138efc299eaec04127e9)
Change-Id: I86022d6edab73dc4d11269783900710dc07a5b49
Baligh Uddin [Fri, 30 Jan 2015 15:09:16 +0000 (07:09 -0800)]
Fix plurals variable to unblock Translations Pipeline.
Bug:
19067882
(cherry picked from commit
50d23adfe26bf0cf9a34138efc299eaec04127e9)
Change-Id: I86022d6edab73dc4d11269783900710dc07a5b49
Wale Ogunwale [Wed, 6 Jan 2016 15:55:02 +0000 (15:55 +0000)]
Merge "[WindowManagerService] fix starting window issue"
am:
8683f1b160
* commit '
8683f1b160c10184aa15cec1b8ef776e2ce8fa9a':
[WindowManagerService] fix starting window issue
Wale Ogunwale [Wed, 6 Jan 2016 15:47:05 +0000 (15:47 +0000)]
Merge "[WindowManagerService] fix starting window issue"
Jeremy Joslin [Fri, 18 Dec 2015 01:38:04 +0000 (17:38 -0800)]
Exit getAllValidScorers early if not the primary.
This fixes the crash that occurs when getAllValidScorers() is invoked by
a non-primary user when a scorer is active.
BUG:
23040221
Change-Id: I42c9e18d74389be3191258ca5626f2c433ca7cc7
Chad Brubaker [Mon, 4 Jan 2016 20:49:29 +0000 (20:49 +0000)]
Merge "Add ConfigNetworkSecurityPolicy"
am:
2786002bd5
* commit '
2786002bd51b229d9a4672e3c43f835796de06ea':
Add ConfigNetworkSecurityPolicy
Chad Brubaker [Mon, 4 Jan 2016 20:26:56 +0000 (20:26 +0000)]
Merge "Add ConfigNetworkSecurityPolicy"
Dan Sandler [Mon, 4 Jan 2016 20:07:38 +0000 (20:07 +0000)]
Merge "Use GregorianCalendar.add() when searching for next alarm."
am:
b52de8248f
* commit '
b52de8248f8e5f95f7984967e646eb9b3a641526':
Use GregorianCalendar.add() when searching for next alarm.
Dan Sandler [Mon, 4 Jan 2016 19:58:42 +0000 (19:58 +0000)]
Merge "Use GregorianCalendar.add() when searching for next alarm."
Ronnie Leng [Mon, 4 Jan 2016 17:36:08 +0000 (11:36 -0600)]
[WindowManagerService] fix starting window issue
Symptom:
1. Acitivity A and B belong to same task.
2. A is started and start B in its code
3. B is opened with blank screen
If starting icon has been display, both startingWindow and
startingView should not be null.
Current logic only uses judgement on startWindow. In above
case, it leads startingView set to null as A and B shares
the same starting window due to same task. Then system will
not get chance to remove startingView as it is null.
It needs add judgement on startingView.
Change-Id: I6cfa1a3ebce93ce435cc2d9ada239b1e808988de
Dan Sandler [Tue, 29 Dec 2015 20:45:39 +0000 (15:45 -0500)]
Use GregorianCalendar.add() when searching for next alarm.
Never attribute to malice that which is adequately explained
by a bug, particularly one involving date math.
Bug:
26326394
Change-Id: I3483ac102c678a8852565c8ea94c06e19b3f26d8
Gus Prevas [Tue, 29 Dec 2015 15:20:39 +0000 (15:20 +0000)]
Merge "Defines task to front/back animations in styles_micro." into cw-e-dev am:
1d3bac82b3 am:
b805bb8b66
am:
19c7ad05f7
* commit '
19c7ad05f7bc950ffe23dcb3d01668229b4735c1':
Defines task to front/back animations in styles_micro.
Gus Prevas [Tue, 29 Dec 2015 15:16:23 +0000 (15:16 +0000)]
Merge "Defines task to front/back animations in styles_micro." into cw-e-dev am:
1d3bac82b3
am:
b805bb8b66
* commit '
b805bb8b660c5897e7a379fb2d79815269039271':
Defines task to front/back animations in styles_micro.
Gus Prevas [Tue, 29 Dec 2015 15:12:10 +0000 (07:12 -0800)]
Merge "Defines task to front/back animations in styles_micro." into cw-e-dev
am:
1d3bac82b3
* commit '
1d3bac82b3bc59fd7225a3c27b32db2fc90b0308':
Defines task to front/back animations in styles_micro.
Gus Prevas [Tue, 29 Dec 2015 15:09:26 +0000 (15:09 +0000)]
Merge "Defines task to front/back animations in styles_micro." into cw-e-dev
Pavlin Radoslavov [Tue, 29 Dec 2015 01:31:16 +0000 (01:31 +0000)]
Merge "Use GID "wakelock" to control access to kernel wakelock"
am:
60d142c54b
* commit '
60d142c54b16be08d8352c7fd1510538014839f7':
Use GID "wakelock" to control access to kernel wakelock
Pavlin Radoslavov [Tue, 29 Dec 2015 01:24:14 +0000 (01:24 +0000)]
Merge "Use GID "wakelock" to control access to kernel wakelock"
Pavlin Radoslavov [Tue, 24 Nov 2015 01:13:25 +0000 (17:13 -0800)]
Use GID "wakelock" to control access to kernel wakelock
* Added GID "wakelock" (3010) to the list of groups the System Server
belongs to.
* Added GID "wakelock" to the list of assigned groups for the
"android.permission.BLUETOOTH_STACK" Android permission.
* Grant CAP_BLOCK_SUSPEND to processes that belong to GID "wakelock"
Bug:
25864142
Change-Id: I8a9a5f11e4a9ecd1abf2d4f4b90ec89b3101332e
Gus Prevas [Mon, 28 Dec 2015 20:02:13 +0000 (15:02 -0500)]
Defines task to front/back animations in styles_micro.
Bug:
26112737
Change-Id: I9f8c1da21580d525c32a76f25e223dc24d012837
Narayan Kamath [Thu, 24 Dec 2015 12:07:42 +0000 (04:07 -0800)]
Merge changes from topic \'aosp-merge-24-12\'
am:
e0e81bf407
* commit '
e0e81bf407508ec096c752948f8794af5fd480ca':
Special case system_server to not create the JIT code cache.
Don't use IntegralToString
Track libcore commit
85d69e16fe1e59e50c1ad228e754abf325088362.
Track API changes to java.lang.ref.Reference.
Remove merge markers from preloaded-classes
Move StrictJarFile from libcore to framework
Switch RecoverySystem impl to use sun.security.pkcs
API update for OpenJdk based libcore
Use libcore/known_oj_tags for the javadoc stage.
Stop preloading fortress classes
Use HexDump instead of java.lang.IntegralToString
Add core-oj to the list of core library jars.
Narayan Kamath [Thu, 24 Dec 2015 11:56:44 +0000 (11:56 +0000)]
Merge changes from topic 'aosp-merge-24-12'
* changes:
Special case system_server to not create the JIT code cache.
Don't use IntegralToString
Track libcore commit
85d69e16fe1e59e50c1ad228e754abf325088362.
Track API changes to java.lang.ref.Reference.
Remove merge markers from preloaded-classes
Move StrictJarFile from libcore to framework
Switch RecoverySystem impl to use sun.security.pkcs
API update for OpenJdk based libcore
Use libcore/known_oj_tags for the javadoc stage.
Stop preloading fortress classes
Use HexDump instead of java.lang.IntegralToString
Add core-oj to the list of core library jars.
Martijn Coenen [Wed, 23 Dec 2015 08:29:19 +0000 (00:29 -0800)]
Merge "Clear calling identify b4 Beam callback." into mnc-dr1.5-dev am:
4bbd3c4819
am:
c94df7c685
* commit '
c94df7c685947d8263f3617c3cd352a0bcd9e8c1':
Clear calling identify b4 Beam callback.
Martijn Coenen [Wed, 23 Dec 2015 08:25:08 +0000 (00:25 -0800)]
Merge "Clear calling identify b4 Beam callback." into mnc-dr1.5-dev
am:
4bbd3c4819
* commit '
4bbd3c4819fa9766442f6a063a4be2a786be8180':
Clear calling identify b4 Beam callback.
Martijn Coenen [Wed, 23 Dec 2015 08:22:21 +0000 (08:22 +0000)]
Merge "Clear calling identify b4 Beam callback." into mnc-dr1.5-dev
Nicolas Geoffray [Fri, 11 Dec 2015 15:01:04 +0000 (15:01 +0000)]
Special case system_server to not create the JIT code cache.
(cherry picked from commit
3c43b3863328e339dff90b216aed15194d129e4a)
Change-Id: Ic7b0887f9edcb950fad98ccbe66cab6949fbdc52
Chad Brubaker [Tue, 1 Dec 2015 21:03:27 +0000 (13:03 -0800)]
Don't use IntegralToString
Fix master build
(cherry picked from commit
7845e44c0cff3ec6a9ea0e5059fa1f7019ef0eb7)
Change-Id: Ic99a5e868b5d42e7bf72ef5388e30f070b6655d8
Narayan Kamath [Sun, 20 Dec 2015 20:17:40 +0000 (20:17 +0000)]
Track libcore commit
85d69e16fe1e59e50c1ad228e754abf325088362.
Unhide Pattern.UNICODE_CHARACTER_CLASS.
(cherry picked from commit
c55d9e767a2ddaced89f4528ce0fce4f2f89357e)
Change-Id: I5c53d8db13948c5d143c05694f49872456c260eb
Narayan Kamath [Wed, 9 Dec 2015 15:59:03 +0000 (15:59 +0000)]
Track API changes to java.lang.ref.Reference.
(cherry picked from commit
12f62b7ec1e0d119541ab8febd337012248d2eb7)
Change-Id: I7a08d9de7cf39e4c3e11aa504e5e48a7edf17333
Przemyslaw Szczepaniak [Wed, 2 Dec 2015 11:32:22 +0000 (11:32 +0000)]
Remove merge markers from preloaded-classes
(cherry picked from commit
b0868054720a05d9e6d8ef6ee7e4c8c2d176f456)
Change-Id: Ieb1953e33dab7f852740872af110a938eb5c1ca4
Przemyslaw Szczepaniak [Tue, 3 Nov 2015 09:47:56 +0000 (09:47 +0000)]
Move StrictJarFile from libcore to framework
Bug:
25337946
(cherry picked from commit
8a7c1606d88873c5a1b5764c16cb046b6f2275b2)
Change-Id: I1bfce4129887d7cbfc02d92641b44920d7cdbbee
Przemyslaw Szczepaniak [Thu, 9 Jul 2015 12:28:30 +0000 (13:28 +0100)]
Switch RecoverySystem impl to use sun.security.pkcs
Due to org.apache.harmony.security package removal,
RecoverySystem#verifyPackage was rewritten to use
sun.security.pkcs package for verifining package
signature.
(cherry picked from commit
9ad08ec5be0d1e225c9f463fd395ba852b6b5bba)
Change-Id: I04848ad8f045f87224f9d30ff8dd745aac6d08fd
Przemyslaw Szczepaniak [Thu, 19 Nov 2015 16:39:03 +0000 (16:39 +0000)]
API update for OpenJdk based libcore
(cherry picked from commit
7e1fb09d0b8e94f55509c65aca797c467c810f89)
Change-Id: Idc1639d3bc751c5fa738bc661e6bb8077240bd3b
Narayan Kamath [Mon, 27 Jul 2015 13:02:11 +0000 (14:02 +0100)]
Use libcore/known_oj_tags for the javadoc stage.
Helps us process (and discard) OpenJdk specific javadoc tags.
(cherry picked from commit
2c4f2843f4aa904c27dc78086bff039dbd295959)
Change-Id: Ib90ce70509fefa24608067db18cfc21c6c5d0590
Przemyslaw Szczepaniak [Wed, 18 Nov 2015 15:03:13 +0000 (15:03 +0000)]
Stop preloading fortress classes
(cherry picked from commit
f1e520169309f1303d4383298dd5644df59efe4b)
Change-Id: I4fd13c4dc373482c1235b54746fdf7f029a80dc2
Przemyslaw Szczepaniak [Thu, 15 Oct 2015 10:04:19 +0000 (11:04 +0100)]
Use HexDump instead of java.lang.IntegralToString
java.lang.IntegralToString is being removed, replaced
all its usage by com.android.internal.util.HexDump.
(cherry picked from commit
3f72604be806c0173b5dca0225cadf6e7c872147)
Change-Id: I0527d580f5975dca0dfaa6f86fa3695dd49d0849
Piotr Jastrzebski [Tue, 17 Feb 2015 16:58:52 +0000 (16:58 +0000)]
Add core-oj to the list of core library jars.
With some core classes moved to separate core-oj jar
we need to use the new jar.
(cherry picked from commit
cfa292e1dad184648bf673167f3f35b4fb34fc93)
Change-Id: Iba481c3df029902a2bd0f9661d0819f4a191b2aa
Dimitry Ivanov [Mon, 21 Dec 2015 23:27:57 +0000 (15:27 -0800)]
Merge "Use shared namespace for bundled app classloader"
am:
76a9e55a8f
* commit '
76a9e55a8fd751e747511a9c7d02dddca31964c3':
Use shared namespace for bundled app classloader
Dimitry Ivanov [Mon, 21 Dec 2015 23:10:49 +0000 (23:10 +0000)]
Merge "Use shared namespace for bundled app classloader"
Chad Brubaker [Mon, 21 Dec 2015 19:01:01 +0000 (19:01 +0000)]
Merge "Add hostname aware isCleartextTrafficPermitted"
am:
a2f2c5c340
* commit '
a2f2c5c340b552b92088966734097845b76ea310':
Add hostname aware isCleartextTrafficPermitted
Chad Brubaker [Mon, 21 Dec 2015 18:52:48 +0000 (18:52 +0000)]
Merge "Add hostname aware isCleartextTrafficPermitted"
Geoff Mendal [Mon, 21 Dec 2015 15:01:38 +0000 (15:01 +0000)]
Import translations. DO NOT MERGE am:
fd87e92a42 -s ours
am:
bb107a854d -s ours
* commit '
bb107a854d64b5c7ed4d8d93fc4c836e9e21c4c1':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 21 Dec 2015 14:57:31 +0000 (14:57 +0000)]
Import translations. DO NOT MERGE
am:
72675c67d0 -s ours
* commit '
72675c67d052b69dbac3a01faf631de90533a1dd':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 21 Dec 2015 14:57:29 +0000 (14:57 +0000)]
Import translations. DO NOT MERGE
am:
fd87e92a42 -s ours
* commit '
fd87e92a42b659be5b120c59d9413d41e94b6753':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 21 Dec 2015 14:53:38 +0000 (06:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5348b439170faa76b7d85ce1ab04cebeb0a17c69
Auto-generated-cl: translation import
Geoff Mendal [Mon, 21 Dec 2015 14:50:08 +0000 (06:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: If00b01a244af6221a01d0c060c58da7389fd1b35
Auto-generated-cl: translation import
Martijn Coenen [Mon, 21 Dec 2015 10:29:45 +0000 (11:29 +0100)]
Clear calling identify b4 Beam callback.
Fixes AppOps crash, because it notices the calling
package is different from the calling UID.
Bug:
25492633
Change-Id: I55e2d975fd0a7ee94c4623efb3b19b1b54b72da2
Calin Juravle [Mon, 21 Dec 2015 09:52:40 +0000 (09:52 +0000)]
Merge "Pass app\'s code paths to the runtime"
am:
db73912471
* commit '
db73912471df39aa527971f2884f37295616d3a9':
Pass app's code paths to the runtime
Calin Juravle [Mon, 21 Dec 2015 09:43:34 +0000 (09:43 +0000)]
Merge "Pass app's code paths to the runtime"
Dimitry Ivanov [Sat, 12 Dec 2015 01:34:21 +0000 (17:34 -0800)]
Use shared namespace for bundled app classloader
Allow bundled apps to reference platform native libraries
located in subdirectories of the default library path
(/system/lib/hw/* for example).
In addition to this bundled apps need to share native
libraries with default namespace. Added parameter to
ApplicationLoaders.createClassLoader() to do just that.
Bug:
26165097
Bug:
26164393
(cherry picked from commit
75b10ecccdd1881390075dd22c1d4f9bdf1c5828)
Change-Id: I836e5fed4713f2a605a5de673c40970ef6d988dd
Nick Kralevich [Sat, 19 Dec 2015 07:08:22 +0000 (07:08 +0000)]
Merge "common_time_server.cpp: more O_CLOEXEC"
am:
78d5f90d98
* commit '
78d5f90d98365987937b680862c4d88f3beaa4a3':
common_time_server.cpp: more O_CLOEXEC
Nick Kralevich [Sat, 19 Dec 2015 06:58:58 +0000 (06:58 +0000)]
Merge "common_time_server.cpp: more O_CLOEXEC"
Nick Kralevich [Sat, 19 Dec 2015 04:47:02 +0000 (20:47 -0800)]
common_time_server.cpp: more O_CLOEXEC
Change-Id: I2185a462d72e11f5a015c525d2d37c52ecc3e430
Bryce Lee [Fri, 18 Dec 2015 23:19:18 +0000 (23:19 +0000)]
Merge "Remove duplicate Bluetooth profiles." into cw-e-dev am:
9c27969385 am:
d980b8c7a0
am:
1b695edc97
* commit '
1b695edc97c227a64ef810daee7dc9f3b35206a7':
Remove duplicate Bluetooth profiles.
Bryce Lee [Fri, 18 Dec 2015 23:13:51 +0000 (23:13 +0000)]
Merge "Remove duplicate Bluetooth profiles." into cw-e-dev am:
9c27969385
am:
d980b8c7a0
* commit '
d980b8c7a05a2dc51145c3465c14f1f106a8bc47':
Remove duplicate Bluetooth profiles.
Bryce Lee [Fri, 18 Dec 2015 23:07:49 +0000 (23:07 +0000)]
Merge "Remove duplicate Bluetooth profiles." into cw-e-dev
am:
9c27969385
* commit '
9c27969385d7a59a535ba3274c279ae96a155d49':
Remove duplicate Bluetooth profiles.
Bryce Lee [Fri, 18 Dec 2015 23:02:40 +0000 (23:02 +0000)]
Merge "Remove duplicate Bluetooth profiles." into cw-e-dev
Daniel Koulomzin [Fri, 18 Dec 2015 20:15:10 +0000 (12:15 -0800)]
Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev am:
cbef517d02 am:
898e330aae
am:
94794af6be
* commit '
94794af6bee35c249857f0440c361d589b77aa5d':
Making ViewRootImpl drop input events when the Activity is in ambient mode.
Robert Greenwalt [Fri, 18 Dec 2015 20:09:54 +0000 (12:09 -0800)]
Daniel Koulomzin [Fri, 18 Dec 2015 20:09:35 +0000 (20:09 +0000)]
Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev am:
cbef517d02
am:
898e330aae
* commit '
898e330aaedbfa9e41d649187800c307e3d84169':
Making ViewRootImpl drop input events when the Activity is in ambient mode.
Daniel Koulomzin [Fri, 18 Dec 2015 19:55:52 +0000 (11:55 -0800)]
Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev
am:
cbef517d02
* commit '
cbef517d02f4f3680e155cc1a704ebf5c959d03f':
Making ViewRootImpl drop input events when the Activity is in ambient mode.
Daniel Koulomzin [Fri, 18 Dec 2015 19:49:18 +0000 (19:49 +0000)]
Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev
Robert Greenwalt [Fri, 18 Dec 2015 19:42:58 +0000 (11:42 -0800)]
Robert Greenwalt [Fri, 18 Dec 2015 19:36:54 +0000 (19:36 +0000)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489 am:
5946a9b798 am:
2ecc918bd3 am:
81674b1ff5 am:
1e04dfb926 am:
3927089cce
am:
f1530bf3d7
* commit '
f1530bf3d72315256dd7a2c18ba383dc15445b54':
Protect some new broadcasts.
Bryce Lee [Fri, 18 Dec 2015 19:34:20 +0000 (11:34 -0800)]
Remove duplicate Bluetooth profiles.
Change-Id: I04fd867511713dd02ef249b113f7a46c69f22f98
Robert Greenwalt [Fri, 18 Dec 2015 19:31:54 +0000 (11:31 -0800)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489 am:
5946a9b798 am:
2ecc918bd3 am:
81674b1ff5 am:
1e04dfb926
am:
3927089cce
* commit '
3927089cce9d43a0b517f53fd6a542f07cb0955b':
Protect some new broadcasts.
Robert Greenwalt [Fri, 18 Dec 2015 19:24:53 +0000 (11:24 -0800)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489 am:
5946a9b798 am:
2ecc918bd3 am:
81674b1ff5
am:
1e04dfb926
* commit '
1e04dfb926040a6fad073fca0835777123d155e7':
Protect some new broadcasts.