Shawn Willden
615f39f911
am 254c58c4: Merge changes Id9a22ad3,I629ab2c4
...
* commit '254c58c4e760e0af132d680fbd783a38ef436435':
Add KM_TAG_AUTH_TOKEN.
Add support for KM_TAG_USER_SECURE_ID.
2015-03-19 00:41:58 +00:00
Shawn Willden
254c58c4e7
Merge changes Id9a22ad3,I629ab2c4
...
* changes:
Add KM_TAG_AUTH_TOKEN.
Add support for KM_TAG_USER_SECURE_ID.
2015-03-19 00:27:38 +00:00
Mathieu Chartier
f792e01606
am 437ac8f8: Merge "Add JIT late override property"
...
* commit '437ac8f8445b078041171eff56ce7ffbd1cf6766':
Add JIT late override property
2015-03-18 23:09:21 +00:00
Mathieu Chartier
437ac8f844
Merge "Add JIT late override property"
2015-03-18 22:56:55 +00:00
Andreas Gampe
b078ff16a3
am 13dbc3d4: Merge "Frameworks/base: Fix potential NPE in InputMethod"
...
* commit '13dbc3d48d1c4ea8854f952f9ced4b7617ae5e87':
Frameworks/base: Fix potential NPE in InputMethod
2015-03-18 22:33:28 +00:00
Andreas Gampe
1eca7d66ee
am 2a247b36: Merge "Frameworks/base: Fix visibility flag in Editor"
...
* commit '2a247b361089c0744202b604e22f9a79d239b92c':
Frameworks/base: Fix visibility flag in Editor
2015-03-18 22:33:09 +00:00
Andreas Gampe
13dbc3d48d
Merge "Frameworks/base: Fix potential NPE in InputMethod"
2015-03-18 22:19:58 +00:00
Mathieu Chartier
7a49028aa2
Add JIT late override property
...
Required for JIT debug property since user builds can't restart
the shell.
Bug: 19735273
Change-Id: I1983852e80010c344b45e0bb459de47c56adfce8
2015-03-18 15:18:52 -07:00
Andreas Gampe
4236ad7a2f
Frameworks/base: Fix potential NPE in InputMethod
...
Don't read the size of an unchecked list.
Bug: 19797138
Change-Id: I9d8c087aff7bc9cc1e8aae9a0b489e23b5442765
2015-03-17 21:07:21 -07:00
Andreas Gampe
4976e2de8d
Frameworks/base: Fix visibility flag in Editor
...
Fix double check.
Bug: 19797138
Change-Id: I95e694f384f1f25d6cf3b6a1669052940385e41d
2015-03-17 16:08:43 -07:00
Andreas Gampe
d6f25364ee
am 9568772a: Merge "Frameworks/base: Fix format string in Geofence"
...
* commit '9568772acbf5b36f2edb41f7c5b06d499329add0':
Frameworks/base: Fix format string in Geofence
2015-03-17 21:42:55 +00:00
Andreas Gampe
9568772acb
Merge "Frameworks/base: Fix format string in Geofence"
2015-03-17 21:30:49 +00:00
Andreas Gampe
1414a6291d
Frameworks/base: Fix format string in Geofence
...
%p is not a valid conversion in format strings. It is also superfluous,
as it is already known that location is null.
Bug: 19797138
Change-Id: I5784e28b05b4ca9aac57e0fc9da4a7f01d9b3247
2015-03-17 21:30:20 +00:00
Andreas Gampe
3814163b6d
am aae42eb2: Merge "Frameworks/base: Fix format string in Camera"
...
* commit 'aae42eb26176482b09f0846e6acf7efa844a0d23':
Frameworks/base: Fix format string in Camera
2015-03-17 21:05:48 +00:00
Andreas Gampe
aae42eb261
Merge "Frameworks/base: Fix format string in Camera"
2015-03-17 20:52:21 +00:00
Andreas Gampe
02ffb2aad9
Frameworks/base: Fix format string in Camera
...
One cannot print a boolean with %d. That will result in an exception.
Bug: 19797138
Change-Id: I86c42ea834cebebaecff8463637cc9de14d1fc88
2015-03-17 20:51:38 +00:00
Andreas Gampe
e4bdf3c1c9
am be549f9b: Merge "Frameworks/base: Fix precedence bug"
...
* commit 'be549f9b8e01f884a2cc2d668457c6b1c12ff4cc':
Frameworks/base: Fix precedence bug
2015-03-17 20:49:18 +00:00
Andreas Gampe
c8484abbbd
am 0ae488e1: Merge "Frameworks/base: Use || instead of |"
...
* commit '0ae488e1cb64318906397a40d8be4866e81e4860':
Frameworks/base: Use || instead of |
2015-03-17 20:41:04 +00:00
Andreas Gampe
17eda7d0be
am 4d907643: Merge "Frameworks/base: Fix trivial equals implementation"
...
* commit '4d9076437c0270cd863493f505e734a3108e89ea':
Frameworks/base: Fix trivial equals implementation
2015-03-17 20:40:58 +00:00
Andreas Gampe
be549f9b8e
Merge "Frameworks/base: Fix precedence bug"
2015-03-17 20:36:21 +00:00
Andreas Gampe
869d26fda0
Frameworks/base: Fix precedence bug
...
Explicit cast has higher precedence than shift.
Bug: 19797138
Change-Id: Ifcf569bf774fbf65ee50c078f736ad167bcc6b8c
2015-03-17 20:31:22 +00:00
Andreas Gampe
0ae488e1cb
Merge "Frameworks/base: Use || instead of |"
2015-03-17 20:28:53 +00:00
Andreas Gampe
e1b9262084
Frameworks/base: Use || instead of |
...
Nothing wrong with | in this case, but || is canonical.
Bug: 19797138
Change-Id: I5f145736a5470f7cde06efce9a217d86eda2135f
2015-03-17 20:27:42 +00:00
Andreas Gampe
4d9076437c
Merge "Frameworks/base: Fix trivial equals implementation"
2015-03-17 20:25:20 +00:00
Andreas Gampe
610b2c778c
Frameworks/base: Fix trivial equals implementation
...
The comparator's equal implementation doesn't satisfy the constraints
of an equals method, namely being reflexive. Use the standard Object
implementation instead.
Bug: 19797138
Change-Id: I74f888e99533e1945aab7ab10fe8ee3ded6388f4
2015-03-17 20:24:45 +00:00
Filip Gruszczynski
81c47fc23a
am 86318d76: Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev
...
* commit '86318d768a2c5043e1261e9daacf1497d1e4a732':
Option for going home when going to sleep for devices without physical button.
2015-03-17 18:35:17 +00:00
Andreas Gampe
14e436aec4
am 345a8f69: Merge "Frameworks/base: Fix a comparison"
...
* commit '345a8f69ea2acd6d3ecf4c200cb33e8037f8798c':
Frameworks/base: Fix a comparison
2015-03-17 00:25:04 +00:00
Andreas Gampe
345a8f69ea
Merge "Frameworks/base: Fix a comparison"
2015-03-17 00:12:25 +00:00
Andreas Gampe
7f95a1bc32
am 5eb42122: Merge "Frameworks/base: Force long computation"
...
* commit '5eb421221bcade4f5715d42843346f7d3c733547':
Frameworks/base: Force long computation
2015-03-16 20:49:12 +00:00
Andreas Gampe
5eb421221b
Merge "Frameworks/base: Force long computation"
2015-03-16 20:37:02 +00:00
Andreas Gampe
8af305f17f
am 6878ee57: Merge "Revert "Frameworks/base: Fix a constructor""
...
* commit '6878ee57b438b063fcc09a19a04fba92e113c1d2':
Revert "Frameworks/base: Fix a constructor"
2015-03-16 18:03:17 +00:00
Andreas Gampe
6878ee57b4
Merge "Revert "Frameworks/base: Fix a constructor""
2015-03-16 17:51:15 +00:00
Andreas Gampe
8c80efeaeb
Revert "Frameworks/base: Fix a constructor"
...
The constructor was public API, doh. Gotta do this differently.
This reverts commit 33c5b2a62f .
Change-Id: Iadca87fe6a8866a8bd9d6f2a91578ec0d4c44691
2015-03-16 17:51:01 +00:00
Andreas Gampe
19279ec048
am d61cbf9a: Merge "Frameworks/base: Fix a constructor"
...
* commit 'd61cbf9a08733b45a6aecafffffa60da269a3e1e':
Frameworks/base: Fix a constructor
2015-03-16 17:03:02 +00:00
Andreas Gampe
d61cbf9a08
Merge "Frameworks/base: Fix a constructor"
2015-03-16 16:51:01 +00:00
Filip Gruszczynski
9779e128d6
Option for going home when going to sleep for devices without physical button.
...
Bug: 19623388
Change-Id: Iec16f83c64646ded12ec97d4b540510b7f9dfd47
2015-03-16 08:57:17 -07:00
Andreas Gampe
038b846284
am 5abcd06b: Merge "Frameworks/base: Fix always-false equals"
...
* commit '5abcd06b1f673a2d59d1aba5f4b95fe741ace274':
Frameworks/base: Fix always-false equals
2015-03-16 15:43:37 +00:00
Andreas Gampe
63662320ae
Frameworks/base: Force long computation
...
Ensure that an int-based computation is carried out as long.
Change-Id: I23b10a95600674e8a5a65c0ea349afdc6aa152ae
2015-03-15 20:17:07 -07:00
Andreas Gampe
650989b0b5
Frameworks/base: Fix a comparison
...
Change-Id: I80d62869920e77110c95f20369ec2631c75f6ed4
2015-03-15 18:04:41 -07:00
Andreas Gampe
33c5b2a62f
Frameworks/base: Fix a constructor
...
This was meant to be a constructor, according to the comment.
Change-Id: Ief49011b392e58b37d9acb4a3f754f1828b256af
2015-03-15 14:29:16 -07:00
Andreas Gampe
007cfa73b8
Frameworks/base: Fix always-false equals
...
Rect != Insets.
Change-Id: I3d4ff890608e446b51f09a1b633af742f0c069d4
2015-03-15 14:19:43 -07:00
Shawn Willden
fe2b1a8298
Add KM_TAG_AUTH_TOKEN.
...
Change-Id: Id9a22ad32137f3e0380c2812f790bbecab511d11
2015-03-14 10:51:56 -06:00
Shawn Willden
7714a9413f
Add support for KM_TAG_USER_SECURE_ID.
...
Change-Id: I629ab2c47ee6d42de20a963ef283e330364c8ee7
2015-03-14 10:50:32 -06:00
Nick Kralevich
870110e01a
am 30fcd2aa: Merge "Drop unusable SELinux APIs."
...
* commit '30fcd2aa8a87ca97e1d6dbc3203c3a485a56dac9':
Drop unusable SELinux APIs.
2015-03-13 18:16:58 +00:00
Stephen Smalley
16d1cce8ff
Drop unusable SELinux APIs.
...
setSELinuxEnforce is not allowed by policy.
get/setBooleanValue and getBooleanNames are moot since SELinux
policy booleans are forbidden by CTS.
Change-Id: I512953edd1c38828efce698ae8475603775c32e8
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov >
2015-03-13 14:09:26 -04:00
Lorenzo Colitti
b6b9fe216d
am 2f196e6c: Merge "Remove dead code, mostly DataStateTracker."
...
* commit '2f196e6c81e50b70d56c1cc06fd2aec147b58ed8':
Remove dead code, mostly DataStateTracker.
2015-03-12 07:38:50 +00:00
Lorenzo Colitti
2f196e6c81
Merge "Remove dead code, mostly DataStateTracker."
2015-03-12 07:27:27 +00:00
Andreas Gampe
26c95085b3
am cdd3fb5c: Merge "Extracted a separate class to run dexopt on packages"
...
* commit 'cdd3fb5cdb9be8ae087c6d0fef2a545fca1c4205':
Extracted a separate class to run dexopt on packages
2015-03-11 23:23:06 +00:00
Fyodor Kupolov
7487657ee9
Extracted a separate class to run dexopt on packages
...
performDexOptLibsLI and related methods were extracted to PackageDexOptimizer
class. Minor refactoring of PackageManagerService.
This is a non-functional change. It should simplify further work to allow
storing OAT files inside package dir.
(cherry picked from commit eeea67b8c3 )
Change-Id: I3494a2da70605362bb6fb4625ffbee1cbe1cd457
2015-03-11 16:03:41 -07:00
Marco Nelissen
42f55d1e68
am a3d25d74: Merge "Fix context leak"
...
* commit 'a3d25d7489d7e071fb6db01b62ec9d925e1d493d':
Fix context leak
2015-03-11 18:21:24 +00:00