Scott Kennedy
0f5e1975d3
Merge "Add @Nullable to AttributeSet in a couple constructors"
2015-02-11 17:53:50 +00:00
Andrei Kapishnikov
5b4a198abd
Merge "Do not throw NullPointerException from PacService"
2015-02-11 17:46:46 +00:00
Pirama Arumuga Nainar
21761bc5de
am 0cc09449: Merge "Store compiled code in Context.getCodeCacheDir()" automerge: 3fbbe39 automerge: 1641e19
...
* commit '0cc09449b6b1e418a7d04590e28d1336694230ba':
Store compiled code in Context.getCodeCacheDir()
2015-02-11 17:23:12 +00:00
Pirama Arumuga Nainar
0cc09449b6
Merge "Store compiled code in Context.getCodeCacheDir()" automerge: 3fbbe39
...
automerge: 1641e19
* commit '1641e192a82e266159e0b82078a8f98ebcd3d8ff':
Store compiled code in Context.getCodeCacheDir()
2015-02-11 17:15:47 +00:00
Scott Kennedy
76c382ed67
Add @Nullable to AttributeSet in a couple constructors
...
Change-Id: I184113680c5dc867b353df81961e93523b91bbc5
2015-02-10 23:15:39 -08:00
Nick Vaccaro
668ebe9501
am d0d13d82: Merge "Update API to contain new wrist tilt sensor type and string." into lmp-mr1-modular-dev
...
automerge: 5ff5711
* commit '5ff571155f0a405d6f7d298c7acaddc84bb8fb26':
Update API to contain new wrist tilt sensor type and string.
2015-02-11 00:39:14 +00:00
Nick Vaccaro
5ff571155f
am d0d13d82: Merge "Update API to contain new wrist tilt sensor type and string." into lmp-mr1-modular-dev
...
* commit 'd0d13d822cdec4fa7214d1495137064c28ecc07e':
Update API to contain new wrist tilt sensor type and string.
2015-02-11 00:20:52 +00:00
Andres Morales
667d55cf5a
Merge "check bootloader and baseband version"
2015-02-10 23:59:46 +00:00
Fyodor Kupolov
4a39e1bb33
Merge "Added unit test for RegisteredServicesCache"
2015-02-10 23:06:29 +00:00
Fyodor Kupolov
9e0d81e843
Added unit test for RegisteredServicesCache
...
Minor refactoring of RegisteredServicesCache for testability. Added
RegisteredServicesCacheTest which uses a mock version of
RegisteredServicesCache.
Bug:19321135
Change-Id: If18b794b28f03b4bf4bbdfbba9e9a57e808aaebf
2015-02-10 14:05:12 -08:00
Ruben Brunk
4b79268cb7
Merge "camera2: Formatting nitpicks."
2015-02-10 21:20:28 +00:00
Pirama Arumuga Nainar
51772b7601
Store compiled code in Context.getCodeCacheDir()
...
bug 16345623
Use Context.getCodeCacheDir for EGL shader cache and RenderScript
compiled code.
Change-Id: I54c4e43674bd1f9342ae13059cb8899f4a3f4734
2015-02-10 13:17:30 -08:00
Nick Vaccaro
f5021f6818
Update API to contain new wrist tilt sensor type and string.
...
Convert the wrist tilt sensor from being a vendor-defined sensor
type to being an official android sensor type.
Change-Id: I39807bdca4f4c853fa0f7e88e6d98c02245f2a8b
2015-02-10 20:43:44 +00:00
Soonil Nagarkar
9e9345c70a
Merge "Add @SystemApi annotations to ACTION_QUERY_PACKAGE_RESTART and related."
2015-02-10 19:20:36 +00:00
Soonil Nagarkar
0e8fd09708
Add @SystemApi annotations to ACTION_QUERY_PACKAGE_RESTART and related.
...
Make Intent.ACTION_QUERY_PACKAGE_RESTART and Intent.EXTRA_PACKAGES
accessible from GmsCore so that location and context components can
properly respond to the broadcast.
BUG: 19298558
Change-Id: I4b5cf4991c69d3aa745d03271187c65794df10b2
2015-02-10 10:37:36 -08:00
Wale Ogunwale
00c5e4e190
Merge "Set TaskStack config orientation based on dimensions"
2015-02-10 18:35:12 +00:00
Wale Ogunwale
a928127a74
Set TaskStack config orientation based on dimensions
...
The TaskStack override configuration is set based on the
stack dimensions so we can load the most acturate resources
for activities in the stack in a multi-window environment.
Also, disabled fixed screen orientation for resizeable
activities.
Bug: 19305402
Change-Id: I7b182554523b12f2ef77f8bbc7b16891231125bf
2015-02-10 10:16:39 -08:00
Wale Ogunwale
5fa84cde30
Merge "Include stack override configurations in onConfigurationChanged() call."
2015-02-10 16:54:03 +00:00
Wale Ogunwale
dea0bbbeea
Merge "Remove ContextImpl.mOverrideConfiguration to reduce code confusion."
2015-02-10 16:49:44 +00:00
Calin Juravle
399f8a6d17
am fd523efc: Merge "Get the instruction set that the libraries of secondary Abi is supported." automerge: d1e074a
...
automerge: 16df82d
* commit '16df82d7ace0dbe625211561ccec9b6faf81debb':
Get the instruction set that the libraries of secondary Abi is supported.
2015-02-10 16:30:46 +00:00
Calin Juravle
16df82d7ac
am fd523efc: Merge "Get the instruction set that the libraries of secondary Abi is supported."
...
automerge: d1e074a
* commit 'd1e074a72452c909c7ed2a4baf220d9d2f306b20':
Get the instruction set that the libraries of secondary Abi is supported.
2015-02-10 16:23:51 +00:00
Calin Juravle
fd523efcde
Merge "Get the instruction set that the libraries of secondary Abi is supported."
2015-02-10 16:13:30 +00:00
Jorim Jaggi
b10e33ff80
Split up android.policy into framework.jar and services.jar 1/3
...
Change-Id: Ifd69f1f3dd308a7e17a1442e2f3950da8b03cec4
2015-02-10 14:56:02 +01:00
Robin Lee
85bd63f461
DevicePolicy: clarify wipeData docstring
...
Wiping secondary users or profiles does not cause a reboot.
Bug: 19294240
Change-Id: I59179b6d19061067326ea8ef1a730cc21f52ea53
2015-02-10 11:51:00 +00:00
Svetoslav
d9852a9ced
am cf2c8545: am 5521f39f: am c73cfa0f: Accessibiltiy: missed update to the previous patch.
...
automerge: c052b0e
* commit 'c052b0efcef4c8656a972155c6a88135f79ed808':
Accessibiltiy: missed update to the previous patch.
2015-02-10 03:33:01 +00:00
Svetoslav
c052b0efce
am cf2c8545: am 5521f39f: am c73cfa0f: Accessibiltiy: missed update to the previous patch.
...
* commit 'cf2c8545bd6a8888801fa8c04d263879602eeb36':
Accessibiltiy: missed update to the previous patch.
2015-02-10 03:09:20 +00:00
Svetoslav
cf2c8545bd
am 5521f39f: am c73cfa0f: Accessibiltiy: missed update to the previous patch.
...
* commit '5521f39ff75d2af909061581e27810afaa9ed242':
Accessibiltiy: missed update to the previous patch.
2015-02-10 03:01:50 +00:00
Svetoslav
5521f39ff7
am c73cfa0f: Accessibiltiy: missed update to the previous patch.
...
* commit 'c73cfa0ffba344a83d61e2f4eb9715152a2807b8':
Accessibiltiy: missed update to the previous patch.
2015-02-10 02:51:30 +00:00
Svetoslav
c73cfa0ffb
Accessibiltiy: missed update to the previous patch.
...
Change-Id: I4c47d38f5e137dcc1c6db0561b3824a26572027d
2015-02-09 18:33:07 -08:00
Baligh Uddin
c66ee745dc
am 2083173a: am fbf9666f: am b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
...
automerge: a314754
* commit 'a3147545751266f3e58fdadffc4f71e87228c420':
Accessibility: Handle a missed case when clicking focused views.
2015-02-10 01:49:40 +00:00
Baligh Uddin
a314754575
am 2083173a: am fbf9666f: am b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
...
* commit '2083173af997419fbc2e92627fe5500f91ac7e5b':
Accessibility: Handle a missed case when clicking focused views.
2015-02-10 01:25:54 +00:00
Baligh Uddin
2083173af9
am fbf9666f: am b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
...
* commit 'fbf9666f846284ee1d4d09e2d36f0d2b92120656':
Accessibility: Handle a missed case when clicking focused views.
2015-02-10 01:17:42 +00:00
Yin-Chia Yeh
7021b7e370
Merge "Camera2: lens shading related HAL3.3 update"
2015-02-10 01:15:56 +00:00
Baligh Uddin
fbf9666f84
am b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
...
* commit 'b2ba6dfc7b33ec9e58d9f556206440a26069e264':
Accessibility: Handle a missed case when clicking focused views.
2015-02-10 01:07:08 +00:00
Soonil Nagarkar
0059133011
Merge "Revert "Add @SystemApi annotations to ACTION_QUERY_PACKAGE_RESTART and related.""
2015-02-10 00:58:47 +00:00
Baligh Uddin
b2ba6dfc7b
Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
2015-02-10 00:57:21 +00:00
Andre Eisenbach
7518ade9f6
am cd623416: am 8f31fa81: am 3ca77ccf: am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev
...
* commit 'cd623416455100f64ef3f0be7ced27ffc04938a8':
Add API to check if a Bluetooth connection is encrypted (1/2)
2015-02-10 00:50:06 +00:00
Soonil Nagarkar
ffcd2400aa
Revert "Add @SystemApi annotations to ACTION_QUERY_PACKAGE_RESTART and related."
...
This reverts commit f02fee70e1 .
2015-02-09 16:49:48 -08:00
Andre Eisenbach
cd62341645
am 8f31fa81: am 3ca77ccf: am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev
...
* commit '8f31fa81e0a79f51ceb301193a2c77ca7f619769':
Add API to check if a Bluetooth connection is encrypted (1/2)
2015-02-10 00:42:55 +00:00
Wale Ogunwale
b740537044
Remove ContextImpl.mOverrideConfiguration to reduce code confusion.
...
It is not used.
Change-Id: Ie944df17fbc834c54604ea8ff292b6ba0f202690
2015-02-09 16:35:10 -08:00
Andre Eisenbach
8f31fa81e0
am 3ca77ccf: am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev
...
* commit '3ca77ccf873f12e116a66d1c1a417fe89f75af85':
Add API to check if a Bluetooth connection is encrypted (1/2)
2015-02-10 00:34:43 +00:00
Andre Eisenbach
3ca77ccf87
am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev
...
* commit '455502b7501bdbc55a739083878431c3ba7ef81a':
Add API to check if a Bluetooth connection is encrypted (1/2)
2015-02-10 00:26:51 +00:00
Wale Ogunwale
c2607b4ece
Include stack override configurations in onConfigurationChanged() call.
...
Important for activities that handle configuration changes.
Change-Id: I4d1612026f293fbb99e1abc17e663f0215658ae6
2015-02-09 16:22:04 -08:00
Andre Eisenbach
455502b750
Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev
2015-02-10 00:21:43 +00:00
Soonil Nagarkar
02696d5b0f
Merge "Add @SystemApi annotations to ACTION_QUERY_PACKAGE_RESTART and related."
2015-02-10 00:17:26 +00:00
Soonil Nagarkar
f02fee70e1
Add @SystemApi annotations to ACTION_QUERY_PACKAGE_RESTART and related.
...
Make Intent.ACTION_QUERY_PACKAGE_RESTART and Intent.EXTRA_PACKAGES
accessible from GmsCore so that location and context components can
properly respond to the broadcast.
BUG: 19298558
Change-Id: I8377db7c347068cfdd534e8f85834674f77d4cf3
2015-02-09 16:06:08 -08:00
Matthew Xie
be96280fda
am a96869fc: am 24c02c41: am d67aff68: am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev
...
* commit 'a96869fc1323faa5989803c5235c4c28e1094a16':
Separate the protection of mProxyServiceStateCallbacks from that of mService
2015-02-09 22:22:29 +00:00
Matthew Xie
a96869fc13
am 24c02c41: am d67aff68: am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev
...
* commit '24c02c418673a18a287ce0820f0024f7a18ff181':
Separate the protection of mProxyServiceStateCallbacks from that of mService
2015-02-09 22:14:10 +00:00
Matthew Xie
24c02c4186
am d67aff68: am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev
...
* commit 'd67aff686d467c439970aef4a57a29838bf005c2':
Separate the protection of mProxyServiceStateCallbacks from that of mService
2015-02-09 22:07:50 +00:00
Matthew Xie
d67aff686d
am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev
...
* commit 'a63ba4287e5c87f41cd7d4b43111fd18f3ec499b':
Separate the protection of mProxyServiceStateCallbacks from that of mService
2015-02-09 21:59:13 +00:00