drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
214,093 Commits 1 Branch 0 Tags
Commit Graph

214093 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Przemyslaw Szczepaniak
d5f0eb0c84 Remove merge markers from preloaded-classes 
(cherry picked from commit b0868054720a05d9e6d8ef6ee7e4c8c2d176f456)

Change-Id: Ieb1953e33dab7f852740872af110a938eb5c1ca4
 2015-12-22 13:10:55 +00:00
Przemyslaw Szczepaniak
6a8ad6d161 Move StrictJarFile from libcore to framework 
Bug: 25337946

(cherry picked from commit 8a7c1606d88873c5a1b5764c16cb046b6f2275b2)

Change-Id: I1bfce4129887d7cbfc02d92641b44920d7cdbbee
 2015-12-22 13:10:55 +00:00
Przemyslaw Szczepaniak
62671eaa46 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
 2015-12-22 13:10:55 +00:00
Przemyslaw Szczepaniak
5f3be92169 API update for OpenJdk based libcore 
(cherry picked from commit 7e1fb09d0b8e94f55509c65aca797c467c810f89)

Change-Id: Idc1639d3bc751c5fa738bc661e6bb8077240bd3b
 2015-12-22 13:10:55 +00:00
Narayan Kamath
a70412b206 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
 2015-12-22 13:10:55 +00:00
Przemyslaw Szczepaniak
bb02b6704d Stop preloading fortress classes 
(cherry picked from commit f1e520169309f1303d4383298dd5644df59efe4b)

Change-Id: I4fd13c4dc373482c1235b54746fdf7f029a80dc2
 2015-12-22 13:10:55 +00:00
Przemyslaw Szczepaniak
e69a31d750 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
 2015-12-22 13:10:55 +00:00
Piotr Jastrzebski
62ed63185c 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
 2015-12-22 13:10:55 +00:00
Dimitry Ivanov
c53d159b3e Merge "Use shared namespace for bundled app classloader" 
am: 76a9e55a8f

* commit '76a9e55a8fd751e747511a9c7d02dddca31964c3':
  Use shared namespace for bundled app classloader
 2015-12-21 15:27:57 -08:00
Dimitry Ivanov
76a9e55a8f Merge "Use shared namespace for bundled app classloader" 2015-12-21 23:10:49 +00:00
Chad Brubaker
c642e052f0 Merge "Add hostname aware isCleartextTrafficPermitted" 
am: a2f2c5c340

* commit 'a2f2c5c340b552b92088966734097845b76ea310':
  Add hostname aware isCleartextTrafficPermitted
 2015-12-21 19:01:01 +00:00
Chad Brubaker
a2f2c5c340 Merge "Add hostname aware isCleartextTrafficPermitted" 2015-12-21 18:52:48 +00:00
Geoff Mendal
82bb06c8f7 Import translations. DO NOT MERGE am: fd87e92a42 -s ours 
am: bb107a854d  -s ours

* commit 'bb107a854d64b5c7ed4d8d93fc4c836e9e21c4c1':
  Import translations. DO NOT MERGE
 2015-12-21 15:01:38 +00:00
Geoff Mendal
254df7ab5f Import translations. DO NOT MERGE 
am: 72675c67d0  -s ours

* commit '72675c67d052b69dbac3a01faf631de90533a1dd':
  Import translations. DO NOT MERGE
 2015-12-21 14:57:31 +00:00
Geoff Mendal
bb107a854d Import translations. DO NOT MERGE 
am: fd87e92a42  -s ours

* commit 'fd87e92a42b659be5b120c59d9413d41e94b6753':
  Import translations. DO NOT MERGE
 2015-12-21 14:57:29 +00:00
Geoff Mendal
72675c67d0 Import translations. DO NOT MERGE 
Change-Id: I5348b439170faa76b7d85ce1ab04cebeb0a17c69
Auto-generated-cl: translation import
 2015-12-21 06:53:38 -08:00
Geoff Mendal
fd87e92a42 Import translations. DO NOT MERGE 
Change-Id: If00b01a244af6221a01d0c060c58da7389fd1b35
Auto-generated-cl: translation import
 2015-12-21 06:50:08 -08:00
Martijn Coenen
24584f0b34 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
 2015-12-21 10:33:06 +00:00
Calin Juravle
7d7ab7ad3b Merge "Pass app\'s code paths to the runtime" 
am: db73912471

* commit 'db73912471df39aa527971f2884f37295616d3a9':
  Pass app's code paths to the runtime
 2015-12-21 09:52:40 +00:00
Calin Juravle
db73912471 Merge "Pass app's code paths to the runtime" 2015-12-21 09:43:34 +00:00
Dimitry Ivanov
44fadb21e0 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
 2015-12-20 14:12:45 -08:00
Nick Kralevich
a87b9287a4 Merge "common_time_server.cpp: more O_CLOEXEC" 
am: 78d5f90d98

* commit '78d5f90d98365987937b680862c4d88f3beaa4a3':
  common_time_server.cpp: more O_CLOEXEC
 2015-12-19 07:08:22 +00:00
Nick Kralevich
78d5f90d98 Merge "common_time_server.cpp: more O_CLOEXEC" 2015-12-19 06:58:58 +00:00
Nick Kralevich
a0468e3361 common_time_server.cpp: more O_CLOEXEC 
Change-Id: I2185a462d72e11f5a015c525d2d37c52ecc3e430
 2015-12-18 20:47:02 -08:00
Bryce Lee
76656c6b48 Merge "Remove duplicate Bluetooth profiles." into cw-e-dev am: 9c27969385 am: d980b8c7a0 
am: 1b695edc97

* commit '1b695edc97c227a64ef810daee7dc9f3b35206a7':
  Remove duplicate Bluetooth profiles.
 2015-12-18 23:19:18 +00:00
Bryce Lee
1b695edc97 Merge "Remove duplicate Bluetooth profiles." into cw-e-dev am: 9c27969385 
am: d980b8c7a0

* commit 'd980b8c7a05a2dc51145c3465c14f1f106a8bc47':
  Remove duplicate Bluetooth profiles.
 2015-12-18 23:13:51 +00:00
Bryce Lee
d980b8c7a0 Merge "Remove duplicate Bluetooth profiles." into cw-e-dev 
am: 9c27969385

* commit '9c27969385d7a59a535ba3274c279ae96a155d49':
  Remove duplicate Bluetooth profiles.
 2015-12-18 23:07:49 +00:00
Bryce Lee
9c27969385 Merge "Remove duplicate Bluetooth profiles." into cw-e-dev 2015-12-18 23:02:40 +00:00
Daniel Koulomzin
3f66df086a 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.
 2015-12-18 12:15:10 -08:00
Robert Greenwalt
c57d50c0fb resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 am: 1e04dfb926 am: 3927089cce am: f1530bf3d7 am: fba515f614 
am: 2ce61fb68a

* commit '2ce61fb68a598622343047aa8a202513a61566c2':
  Protect some new broadcasts.
 2015-12-18 12:09:54 -08:00
Daniel Koulomzin
94794af6be 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.
 2015-12-18 20:09:35 +00:00
Daniel Koulomzin
898e330aae 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.
 2015-12-18 11:55:52 -08:00
Daniel Koulomzin
cbef517d02 Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev 2015-12-18 19:49:18 +00:00
Robert Greenwalt
2ce61fb68a resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 am: 1e04dfb926 am: 3927089cce am: f1530bf3d7 
am: fba515f614

* commit 'fba515f614c1df7a30f2d003f2861bc14bc8fbda':
  Protect some new broadcasts.
 2015-12-18 11:42:58 -08:00
Robert Greenwalt
fba515f614 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.
 2015-12-18 19:36:54 +00:00
Bryce Lee
15309a3d20 Remove duplicate Bluetooth profiles. 
Change-Id: I04fd867511713dd02ef249b113f7a46c69f22f98
 2015-12-18 11:34:20 -08:00
Robert Greenwalt
f1530bf3d7 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.
 2015-12-18 11:31:54 -08:00
Robert Greenwalt
3927089cce 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.
 2015-12-18 11:24:53 -08:00
Robert Greenwalt
1e04dfb926 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 
am: 81674b1ff5

* commit '81674b1ff5deedcf2f1a79f07441e506a4f66354':
  Protect some new broadcasts.
 2015-12-18 19:17:58 +00:00
Robert Greenwalt
81674b1ff5 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 
am: 2ecc918bd3

* commit '2ecc918bd3c7f63ea70a7395b3a622c7f1a40f84':
  Protect some new broadcasts.
 2015-12-18 19:04:25 +00:00
Robert Greenwalt
2ecc918bd3 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 
am: 5946a9b798

* commit '5946a9b798f9a4b0e9eacd2685fc5ec9d6cc9ed6':
  Protect some new broadcasts.
 2015-12-18 18:48:59 +00:00
Mark Lu
8f968ae1a2 Fix system watchdog timeout when reading too many usage events. am: 8877120173 
am: 370567d1f5

* commit '370567d1f5be189c858836746bd93e7482c9571a':
  Fix system watchdog timeout when reading too many usage events.
 2015-12-18 18:45:39 +00:00
Robert Greenwalt
740e5da062 Merge "Check permissions on getDeviceId." into mnc-dev am: 4557ef32fe am: 628b8f1f5f am: a652b7161d am: c99c41781c 
am: b5f6115092

* commit 'b5f611509276516eb26d86fe63e845b7148bec86':
  Check permissions on getDeviceId.
 2015-12-18 18:43:05 +00:00
Robert Greenwalt
15912efe72 Merge "Check permissions on getDeviceId." into mnc-dr-dev am: ef58df63d6 am: 064eb2a7cc am: 5d7bb383b8 
am: 50843b1708

* commit '50843b1708f7662f9be661001125d91e0ef544d7':
  Check permissions on getDeviceId.
 2015-12-18 18:41:23 +00:00
Robert Greenwalt
5946a9b798 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. 
am: 5a77651489

* commit '5a77651489ace080671034a85e5771c6ddc73525':
  Protect some new broadcasts.
 2015-12-18 18:38:10 +00:00
Daniel Koulomzin
087ae471c2 Making ViewRootImpl drop input events when the Activity is in ambient 
mode.

WearableActivityController tells ViewRootImpl about ambient mode.

Bug: 25912259
Bug: 25973146
Bug: 25714113
Change-Id: Idcca2b254db3145039f50f2a7dfd38a224ec287e
 2015-12-18 12:56:00 -05:00
Robert Greenwalt
5a77651489 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. 
Change-Id: I240cac5cba106a7f0fab61e04af2c757b46b0bb0
 2015-12-17 19:32:43 -08:00
Mark Lu
370567d1f5 Fix system watchdog timeout when reading too many usage events. 
am: 8877120173

* commit '8877120173fd62d6701822471f06fe84e992c2ae':
  Fix system watchdog timeout when reading too many usage events.
 2015-12-17 16:18:45 -08:00
Mark Lu
8877120173 Fix system watchdog timeout when reading too many usage events. 
Symptom:
As issue link:
https://code.google.com/p/android/issues/detail?id=193100

RootCause:
UsageStatsService.onDisplayChanged executed in system main thread,
If calling UsageStatsManager.queryEvents with too many events before it
(i.e. in daily usage event file,
too many activity resume / pause events or configuration change
during monkey test),
System will be blocked then watchdog timeout.

Solution:
Let display listener executed in background thread handler

BUG: 25355086

Change-Id: Ic894d112612400ed8fb7ba843b3309fdc4f66fe1
(Cherrypicked from 4e59db328d8b0cc163d2e3eb0f7f3a108f20a58d)
(cherry picked from commit 7018f60b06fd0c647ebf13225320d7e15d02e075)
 2015-12-18 00:03:16 +00:00
Robert Greenwalt
b5f6115092 Merge "Check permissions on getDeviceId." into mnc-dev am: 4557ef32fe am: 628b8f1f5f am: a652b7161d 
am: c99c41781c

* commit 'c99c41781c69d2cfef411c531cf879e84ca62a74':
  Check permissions on getDeviceId.
 2015-12-17 15:15:09 -08:00