Wink Saville
f4d86a1dd9
am f44628e3: am 6bacccbf: Merge "Radio Capability Support." into lmp-sprout-dev
...
* commit 'f44628e3133a6bffd225836b1fff23cd827938a7':
Radio Capability Support.
2014-10-20 21:29:29 +00:00
Wink Saville
f44628e313
am 6bacccbf: Merge "Radio Capability Support." into lmp-sprout-dev
...
* commit '6bacccbfbcdc7952bac7e25c3e3f2d6a6151a215':
Radio Capability Support.
2014-10-20 21:24:27 +00:00
Alan Viverette
49870a1b64
am e28cd1a2: Merge "Only request layout when removeView() actually removes a view" into lmp-mr1-dev
...
* commit 'e28cd1a276d64d697da89cac4941baf79f380f6c':
Only request layout when removeView() actually removes a view
2014-10-20 19:06:49 +00:00
Alan Viverette
e28cd1a276
Merge "Only request layout when removeView() actually removes a view" into lmp-mr1-dev
2014-10-20 19:00:36 +00:00
Wink Saville
2af2d57d57
Radio Capability Support.
...
New design of capability switch for L.
Add new RIL requests:
RIL_REQUEST_GET_RADIO_CAPABILITY
RIL_REQUEST_SET_RADIO_CAPABILITY
RIL_UNSOL_RADIO_CAPABILITY
These commands allow the framework to communicate what the Radio
Capabilities for each logical modem has or should be using.
It can support 2/3/4G switch and has flexible architecture to support
future technology.
Change-Id: Iedf7f608d2ba3c06a883500f2d85abb98e69d9c1
2014-10-20 10:31:05 -07:00
Adrian Roos
0c458aa515
am 7356a713: Merge "Keyguard: Show IME automatically on tablets" into lmp-mr1-dev
...
* commit '7356a7137306a32e690376a46ecf9a5f5443dba0':
Keyguard: Show IME automatically on tablets
2014-10-20 15:20:59 +00:00
Adrian Roos
7356a71373
Merge "Keyguard: Show IME automatically on tablets" into lmp-mr1-dev
2014-10-20 15:17:00 +00:00
Geoff Mendal
003626a6f0
Import translations. DO NOT MERGE
...
Change-Id: I475289e0e1a2e21a9e7be5bc08dce515e3386812
Auto-generated-cl: translation import
2014-10-20 07:09:28 -07:00
Geoff Mendal
5481fa1026
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2014-10-20 13:58:39 +00:00
Geoff Mendal
5d68ce116d
Import translations. DO NOT MERGE
...
Change-Id: I28d8172f0d5419386630f3a11216d8ec93e798b8
Auto-generated-cl: translation import
2014-10-20 06:56:04 -07:00
Geoff Mendal
95469083da
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-10-20 13:52:21 +00:00
Geoff Mendal
00b57dfa4c
Import translations. DO NOT MERGE
...
Change-Id: I2ca7f4219710a776569215757c06e345a00a19cb
Auto-generated-cl: translation import
2014-10-20 06:50:16 -07:00
Adrian Roos
2f6fd87451
am 5f978bfa: Merge "Retire RecentApplicationsDialog" into lmp-mr1-dev
...
* commit '5f978bfa0949d58a187dec0fe9ee6b341cb97c1f':
Retire RecentApplicationsDialog
2014-10-20 13:11:32 +00:00
Adrian Roos
5f978bfa09
Merge "Retire RecentApplicationsDialog" into lmp-mr1-dev
2014-10-20 13:04:09 +00:00
Yuncheol Heo
5814bf1c7b
am 0608b932: CEC: Add a callback for vendor when HDMI control setting is changed.
...
* commit '0608b9328b1c2f804ffb2d4165c34383d34bde2a':
CEC: Add a callback for vendor when HDMI control setting is changed.
2014-10-20 09:14:49 +00:00
Yuncheol Heo
0608b9328b
CEC: Add a callback for vendor when HDMI control setting is changed.
...
- removed unregisterContentObserver() to reactivate the service later.
- added the parameter destAddress to onReceived() callback to
distinguish whether the message is broadcast or not.
Bug: 17962624
Change-Id: I552d14661583f63bb66b07866092f972b259b15a
2014-10-20 16:47:24 +09:00
Jinsuk Kim
f5e6935101
am 7a78e578: Merge "CEC: add getDeviceList()" into lmp-mr1-dev
...
* commit '7a78e578d78ada941d3cc07e280fe7784e84b364':
CEC: add getDeviceList()
2014-10-20 03:14:32 +00:00
Jinsuk Kim
7a78e578d7
Merge "CEC: add getDeviceList()" into lmp-mr1-dev
2014-10-20 03:02:44 +00:00
Jinsuk Kim
bdf27fbf74
CEC: add getDeviceList()
...
Returns the list of all the connected CEC device information. This is
different from getInputDevices() which returns devices of source type only.
For this, turned the local device address list to unmodifiable so that it can
be used by any threads.
Now respects the device type info passed through <Report Physical Address>
rather than always defaulting to the one from HdmiUtil.getTypeFromAddress().
This ensures future compatibility when a device of reserved logical address
comes with a specific type.
Bug: 18046603
Change-Id: I5f7d5e31706efba1ad5dcf4bcfd4ffc918d1d940
2014-10-20 11:32:47 +09:00
Prem Kumar
2f87ebcdef
am cffccb30: am 3f12569d: am 7666c912: Merge "set autojoin associated scan frequency to 20 seconds" into lmp-dev
...
* commit 'cffccb304f969c531d373dc5aea6c96ef4c3ff38':
set autojoin associated scan frequency to 20 seconds
2014-10-18 20:07:49 +00:00
Prem Kumar
cffccb304f
am 3f12569d: am 7666c912: Merge "set autojoin associated scan frequency to 20 seconds" into lmp-dev
...
* commit '3f12569dff185ad5a3ec51d8bd9953ad13a6b534':
set autojoin associated scan frequency to 20 seconds
2014-10-18 20:01:50 +00:00
Prem Kumar
3f12569dff
am 7666c912: Merge "set autojoin associated scan frequency to 20 seconds" into lmp-dev
...
* commit '7666c912b820e61c58b57ad691b4b3babca9fbf9':
set autojoin associated scan frequency to 20 seconds
2014-10-18 19:56:03 +00:00
Prem Kumar
7666c912b8
Merge "set autojoin associated scan frequency to 20 seconds" into lmp-dev
2014-10-18 19:51:53 +00:00
Dianne Hackborn
2ea2bf2840
am ed512c81: Merge "Fix issue #17948288 : Improve accuracy of memory use reporting" into lmp-mr1-dev
...
* commit 'ed512c817c090e2545db89e13837481f86e7596e':
Fix issue #17948288 : Improve accuracy of memory use reporting
2014-10-18 00:46:51 +00:00
Dianne Hackborn
ed512c817c
Merge "Fix issue #17948288 : Improve accuracy of memory use reporting" into lmp-mr1-dev
2014-10-18 00:42:24 +00:00
Alan Viverette
c97924f493
am a496ba55: am e61519b4: am 15e7b2ac: Merge "Translate compound button drawable by scroll position" into lmp-dev
...
* commit 'a496ba555292f091e4051ef7f0bc946a894b2804':
Translate compound button drawable by scroll position
2014-10-18 00:36:44 +00:00
Alan Viverette
a496ba5552
am e61519b4: am 15e7b2ac: Merge "Translate compound button drawable by scroll position" into lmp-dev
...
* commit 'e61519b4a541a4262389842ae8b72dac401b2199':
Translate compound button drawable by scroll position
2014-10-18 00:32:17 +00:00
Alan Viverette
e61519b4a5
am 15e7b2ac: Merge "Translate compound button drawable by scroll position" into lmp-dev
...
* commit '15e7b2ac60b0e6355e6ed5c1be676744c23f5a0e':
Translate compound button drawable by scroll position
2014-10-18 00:26:21 +00:00
Alan Viverette
15e7b2ac60
Merge "Translate compound button drawable by scroll position" into lmp-dev
2014-10-18 00:20:27 +00:00
Alan Viverette
b95c336d78
Translate compound button drawable by scroll position
...
BUG: 18028674
Change-Id: Iaba848642b87f0d134c6a6c57e5756d883e45904
2014-10-17 17:19:12 -07:00
Jim Miller
956e424d00
am d9b81b11: am a054a828: am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev
...
* commit 'd9b81b11b9c3c61d21565d7c6ac250fba1a4f052':
Add utility methods to LockPatternUtils for encryption
2014-10-18 00:03:06 +00:00
Jim Miller
d9b81b11b9
am a054a828: am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev
...
* commit 'a054a8280c1316a1f805cc86f00f571a3b1cfc2f':
Add utility methods to LockPatternUtils for encryption
2014-10-17 23:57:33 +00:00
Jim Miller
a054a8280c
am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev
...
* commit 'c6c843fbe8fb8d9bdd012a472e22970ee89b9d24':
Add utility methods to LockPatternUtils for encryption
2014-10-17 23:52:41 +00:00
Jim Miller
c6c843fbe8
Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev
2014-10-17 23:48:21 +00:00
Yorke Lee
438723e6a8
am a801d349: am 9621b793: am e4e3fcec: Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into lmp-dev
...
* commit 'a801d34911bfb0a1e662fdf124d7c02fb4ffaf27':
Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions
2014-10-17 23:30:55 +00:00
Yorke Lee
a801d34911
am 9621b793: am e4e3fcec: Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into lmp-dev
...
* commit '9621b79396303037a86eb2639035b12080c858bf':
Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions
2014-10-17 23:24:53 +00:00
Yorke Lee
9621b79396
am e4e3fcec: Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into lmp-dev
...
* commit 'e4e3fcec415cdc9739f32ce1eaaec67666e5454d':
Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions
2014-10-17 23:19:31 +00:00
Yorke Lee
e4e3fcec41
Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into lmp-dev
2014-10-17 23:16:35 +00:00
Svetoslav
0ee9f36140
am 0b5af04a: am ebb38bcc: am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev
...
* commit '0b5af04a8b202a2f274bb90c4fa982c813c40a20':
Accessibility no longer overrides strong encryption.
2014-10-17 23:14:57 +00:00
Svetoslav
0b5af04a8b
am ebb38bcc: am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev
...
* commit 'ebb38bcc03a0f770d371b2ed997570572df7aed1':
Accessibility no longer overrides strong encryption.
2014-10-17 23:09:55 +00:00
Jim Miller
dd5de719c5
Add utility methods to LockPatternUtils for encryption
...
This enables a change in Settings that allows device
encryption to be disabled by the user.
Fixes bug 17881324
Change-Id: I34dfc586df1a598bf969dc82adf8537a2730d345
2014-10-17 16:08:21 -07:00
Svetoslav
ebb38bcc03
am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev
...
* commit 'cd2b54e6e546099e028f9e41966ab7cf1deedd3c':
Accessibility no longer overrides strong encryption.
2014-10-17 23:04:12 +00:00
Svetoslav
cd2b54e6e5
Merge "Accessibility no longer overrides strong encryption." into lmp-dev
2014-10-17 22:59:22 +00:00
Dianne Hackborn
b3af4ec6ba
Fix issue #17948288 : Improve accuracy of memory use reporting
...
We now use Mapped to not double-count cached pages that are
mapped in to app processes. Also read in some more values that
count towards kernel RAM use, and count buffers as free rather
than used RAM.
It also looks like the zram accounting is broken -- it was never
collecting the total zram reserved space. I need to figure out
how I was finding that before.
Change-Id: I883f6fc93966774b5c7d2801d1801666dd11ed41
2014-10-17 15:25:13 -07:00
William Bourke
cb1e32ac2b
am 44d51545: am 7d5c68e3: am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev
...
* commit '44d515457a55cdcd92257a711db8dd10f71f0175':
Modified lollipop Easter egg for TV compatibility
2014-10-17 22:14:55 +00:00
William Bourke
44d515457a
am 7d5c68e3: am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev
...
* commit '7d5c68e31eea3848fd8fa75dfd9f7190ef1cd3a3':
Modified lollipop Easter egg for TV compatibility
2014-10-17 22:09:19 +00:00
William Bourke
7d5c68e31e
am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev
...
* commit '84b4791aaf0384a334068a97c70fcda162cfadab':
Modified lollipop Easter egg for TV compatibility
2014-10-17 22:03:50 +00:00
William Bourke
33f577cfea
Modified lollipop Easter egg for TV compatibility
...
Bug: 17997922
Change-Id: I0e2e34245183cdd146ecca02ab09b2c4867770ec
2014-10-17 21:57:23 +00:00
Svetoslav
a6711ff6f0
Accessibility no longer overrides strong encryption.
...
Updating the accessibility layer behavior to reflect the new
model where accessibility no longer overrides strong encryption.
Now enabling an accessibility service lowers the encryption
level but the user can bump it up in settings if desired.
bug:17881324
Change-Id: Ic60d760c267d3f934040a42e1963b179bd8b9f5f
2014-10-17 14:33:11 -07:00
Alan Viverette
177ec4608e
Only request layout when removeView() actually removes a view
...
BUG: 18035456
Change-Id: Iec82be63ef9fc4d0ff90d93f8f3a65328a5e1eba
2014-10-17 13:34:50 -07:00