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

155585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
823675fdbb Deprecate more apache-http. 
bug: 18067888

Change-Id: I50511d53dfc9ae236dfb1646c55a5dd7fa15d7b2
 2014-10-23 17:43:05 +01:00
Narayan Kamath
2acb2b1076 Deprecate apache-http. 
bug: 18067888
Change-Id: Ic066527b070cd662c618c8417431919f0850d57a
 2014-10-23 13:07:39 +01:00
Craig Mautner
4816ed65c6 Merge "Debug for bug 18017409" into lmp-mr1-dev 2014-10-22 03:01:41 +00:00
Leon Scroggins III
754bffe969 am e463bc38: am 3c8bde55: Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev 
* commit 'e463bc388e7f5d83f864b320dde400e390ef5817':
  Report that a JavaInputStreamAdaptor is at end.
 2014-10-22 02:00:46 +00:00
Robin Lee
de7df08cda am fc567900: am e1c9489c: Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev 
* commit 'fc56790085463ab410a5f407a4930b42509ad5f7':
  DevicePolicy: Restore CA warning to K behaviour
 2014-10-22 02:00:38 +00:00
Dongwon Kang
a6372b3be4 Merge "TIF: add more documentation on Hardware session." into lmp-mr1-dev 2014-10-22 01:46:33 +00:00
Craig Mautner
5a3c231dc8 Debug for bug 18017409 
Log adding and removing windows. Log activity state changes.

Change-Id: I544be89ff9af6b13ffde70dedec291793b46a420
 2014-10-21 18:15:20 -07:00
Alan Viverette
bb852b0b6b Merge "Format ListPreference summary with empty string if entry is null" into lmp-mr1-dev 2014-10-22 00:35:29 +00:00
Alan Viverette
13e13ddd4e Format ListPreference summary with empty string if entry is null 
Adding serif-monospace and sans-serif-monospace font families bumped
out the previous monospace, which left the summary as %s. Returning
an unformatted summary is never correct, and we should simply return
a summary populated with an empty string.

BUG: 17666124
Change-Id: Ic22dc5dc87d9ba3ad6f6b92ee059f5c98cbf103a
 2014-10-21 17:05:07 -07:00
Adam Powell
054e8be5e0 Merge "Intent chooser callback" into lmp-mr1-dev 2014-10-21 21:41:19 +00:00
Andrew Lee
74af670019 Merge "Add video calling setting to TelephonyManager." into lmp-mr1-dev 2014-10-21 21:08:46 +00:00
John Reck
bf463af2a5 Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev 2014-10-21 20:59:53 +00:00
Andrew Lee
4a3084a46d Add video calling setting to TelephonyManager. 
We want to add a user setting to enable/disable video calling. This
is a telephony-level setting which the user sets using Telephony's
Call Settings, and applies universally to video calls.

But this setting needs to be accessible in places such as Dialer,
so these changes are to support storing the setting in
TelephonyManager (to be implemented in PhoneInterfaceManager) and
providing access to the setting for applications like Dialer
through TelephonyManager.

+ Add function definitions to ITelephony.
+ Add function wrapper implementations in TelephonyManager.

Bug: 16014284
Change-Id: I1dce8bf5ae4f0ee115698ce9627ba8fc424dd855
 2014-10-21 13:49:42 -07:00
John Reck
bb2d0cc7e1 Surface:lockHardwareCanvas 
Bug: 17440886

Change-Id: I1f2d98c63ec1a2814c2258cf7e0096139263770a
 2014-10-21 13:23:56 -07:00
Andrew Lee
017c6f2daa Merge "Fire onConferenceChanged after reseting conference." into lmp-mr1-dev 2014-10-21 20:02:19 +00:00
Adam Powell
0b3c11260a Intent chooser callback 
Let an app specify an IntentSender as an extra for ACTION_CHOOSER that
will be notified of the user's chosen target. Apps can use this to
implement things like one-touch last used affordances without
implementing their own one-off chooser UI.

Bug 17363684

Change-Id: Ic5d1d0e0c7a0bae3eda6b1d6ade993f3ba865cfa
 2014-10-21 12:17:50 -07:00
John Spurlock
1a3f7db001 VolumeDialog: Restore default-selection logic. 
Bug: 18066513
Change-Id: Ie72189edf9b59fd8d192d882aaadf1ac05dcb359
 2014-10-21 15:16:16 -04:00
John Spurlock
cc8b3e8d4e Merge "Settings: Make SeekBarVolumizer more null-resilient." into lmp-mr1-dev 2014-10-21 18:39:20 +00:00
Alan Viverette
7c133e19dd Merge "Fix gradient drawable radius when specified as float, dimension" into lmp-mr1-dev 2014-10-21 18:25:01 +00:00
John Spurlock
735f9ebc18 Settings: Make SeekBarVolumizer more null-resilient. 
Now that the instances are reusable, ensure all "post" methods
do a handler check, and ensure they are all internal.

Bug: 18063070
Change-Id: Idc478c636686f666f5656f3d07bf2738ba3e9a5a
 2014-10-21 14:23:24 -04:00
John Spurlock
624dd5ce9d Merge "Sysui: Include shared prefs in service dump." into lmp-mr1-dev 2014-10-21 18:16:47 +00:00
Alan Viverette
3d52809bad Merge "Prevent excessive accessibility announcements in TimePicker" into lmp-mr1-dev 2014-10-21 18:16:25 +00:00
Alan Viverette
46b4920ac8 Merge "Propagate state changes even when we don't change drawable index" into lmp-mr1-dev 2014-10-21 18:14:50 +00:00
Alan Viverette
2efbe9816e Fix gradient drawable radius when specified as float, dimension 
BUG: 18070756
Change-Id: I991ff792c376c9695a007f8f1187390ab5ff6e3c
 2014-10-21 11:04:04 -07:00
Andrew Lee
8f8e473cac Fire onConferenceChanged after reseting conference. 
Bug: 17423848
Change-Id: Ic53f40e806f2bfd5b49bff2caad64bb93b290bad
 2014-10-21 10:32:49 -07:00
John Spurlock
7bbb9f6410 Sysui: Include shared prefs in service dump. 
Also:
 - Remove obsolete Prefs helper.
 - Use common file for zen-mode prefs.

Bug: 18062541
Change-Id: I9a6a4733eac0ec1c55da5d359c996cb5fe3bb8af
 2014-10-21 12:26:45 -04:00
Leon Scroggins III
e463bc388e am 3c8bde55: Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev 
* commit '3c8bde5534d81518f5baf3795989f367373f7dfd':
  Report that a JavaInputStreamAdaptor is at end.
 2014-10-21 13:56:42 +00:00
Leon Scroggins III
3c8bde5534 Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev 2014-10-21 13:52:30 +00:00
Robin Lee
fc56790085 am e1c9489c: Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev 
* commit 'e1c9489cc40542bfa2adbb84b6fb77cff4ab8570':
  DevicePolicy: Restore CA warning to K behaviour
 2014-10-21 11:58:38 +00:00
Robin Lee
e1c9489cc4 Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev 2014-10-21 11:54:52 +00:00
Geoff Mendal
a9a550dd8e am deddb384: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'deddb38462389823c194559052c4d64ee6c3b467':
  Import translations. DO NOT MERGE
 2014-10-20 23:43:33 +00:00
Geoff Mendal
deddb38462 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-20 23:39:58 +00:00
Geoff Mendal
e8d005429c Import translations. DO NOT MERGE 
Change-Id: Idcc94d2f5b04a7eea17b530c4a8ff7f8b76fff38
Auto-generated-cl: translation import
 2014-10-20 16:21:14 -07:00
Jinsuk Kim
17e9d2468f Merge "CEC: Add missing protections for some HdmiControlService API" into lmp-mr1-dev 2014-10-20 22:50:37 +00:00
Leon Scroggins III
91332e7eca Report that a JavaInputStreamAdaptor is at end. 
This prevents a naive caller from continuing to attempt to read.

BUG:17419670
BUG:17873145
Change-Id: Idd462ff9055aea42e8c7d5d58ef177f9e667385b
 2014-10-20 22:49:35 +00:00
RoboErik
01c9d330b7 am f0a28411: am 2fa604fc: Merge "Add missing break to switch statement" into lmp-dev 
* commit 'f0a284115a8fb089806eb87db1a20468dd55ecd3':
  Add missing break to switch statement
 2014-10-20 22:19:54 +00:00
Amit Mahajan
1213bf83e9 Merge "Add a constant for invalid profile id value" into lmp-mr1-dev 2014-10-20 22:17:39 +00:00
Jinsuk Kim
b22d9ee0a3 CEC: Add missing protections for some HdmiControlService API 
A few methods are found to be missing protection with system permission.
Add enforceAccessPermission() like other methods.

Bug: 17408780

Change-Id: I58a336b5cc9df2d195bdfe7b928898dde5ff169f
 2014-10-21 07:14:46 +09:00
RoboErik
f0a284115a am 2fa604fc: Merge "Add missing break to switch statement" into lmp-dev 
* commit '2fa604fc59ded63a416066a0bc66f63069cae7f3':
  Add missing break to switch statement
 2014-10-20 22:14:10 +00:00
RoboErik
2fa604fc59 Merge "Add missing break to switch statement" into lmp-dev 2014-10-20 22:08:07 +00:00
RoboErik
59759903a9 Add missing break to switch statement 
the skip to queue item case was falling through when it shouldn't.

bug: 18058515
Change-Id: Ica20b59efad12a58ad16501146fc9a0d4595e184
 2014-10-20 14:56:32 -07:00
Griff Hazen
6e1eb1c966 am aec92e2e: Merge "Disable zen log printouts by default" into lmp-sprout-dev 
* commit 'aec92e2eca4b4197ac45dcde265e2797c7ea9133':
  Disable zen log printouts by default
 2014-10-20 21:46:12 +00:00
Wei Wang
2959231c78 am 33bb6c2d: Merge "Remove spammy log information for BLE scan." into lmp-sprout-dev 
* commit '33bb6c2d3ca798c8275694d0fe700e9fb1fefe99':
  Remove spammy log information for BLE scan.
 2014-10-20 21:46:08 +00:00
smain@google.com
3f256d5295 am ae6dc92c: am 21de5f3f: Doc change: misc changes to highlights. 
* commit 'ae6dc92c3d39862e97a778ea69943ee37a78e92b':
  Doc change: misc changes to highlights.
 2014-10-20 21:46:00 +00:00
Griff Hazen
aec92e2eca Merge "Disable zen log printouts by default" into lmp-sprout-dev 2014-10-20 21:43:16 +00:00
Alan Viverette
f81c6af10e Propagate state changes even when we don't change drawable index 
Previously we could miss the state change if we were simply reversing the
current transition.

BUG: 17967405
Change-Id: I2cb396dedbff61b980741ef8c0d931be6abe129c
 2014-10-20 14:42:53 -07:00
Wei Wang
33bb6c2d3c Merge "Remove spammy log information for BLE scan." into lmp-sprout-dev 2014-10-20 21:41:29 +00:00
smain@google.com
ae6dc92c3d am 21de5f3f: Doc change: misc changes to highlights. 
* commit '21de5f3f12071458c2a1cf3dd39bb9271ee13e92':
  Doc change: misc changes to highlights.
 2014-10-20 21:40:11 +00:00
smain@google.com
21de5f3f12 Doc change: misc changes to highlights. 
Change-Id: I60964bf1d8e299985da9ca6b2b6cfb70a1477bbc
 2014-10-20 14:34:22 -07: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