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

161303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Lee
17455a3d39 Add plumbing for merge failures and renable button. (3/4) 
The merge failure is not plumbed up through any layer that
can trap the callback and act on it.  The first part of this
fix is to create that plumbing.  Then we need to reenable the
merge button. At this point in time, we leverage the fact
that forcing the call to reassess its capabilities will poke
the InCallUI to reenable the merge button. In the future, we
should plumb the merge failure all the way to InCallUI and
not only handle the button but display UI to the user. The UI
is currently being displayed by CallNotifier which is the wrong
place. See b/20530631 for more details.

Bug: 20229905
Change-Id: I0355ada46b484c6db4bee656c77386dd61be5e1f
 2015-04-28 07:13:34 -07:00
Vinit Deshpande
2a550449bc Merge "Added parameter to avoid having a stream opened, and with that, file truncated on no-op." into m-wireless-dev 2015-04-28 01:23:31 +00:00
Jan Nordqvist
e20b8ad4c4 Changed logging tag. 
Change-Id: I9a916305910c65425ffe7ea8d5a29dba0ee9a8da
 2015-04-27 22:15:53 +00:00
Tyler Gunn
d7017c42be Fixing issue where conference calls enable speaker phone. 
- The issue was due to a mis-merge in ParcelableConference.  The write
of the status hints happens at the end of the writeToParcel method.

Bug: 20503132
Change-Id: I40ef9b267b48876006e4cbe29e5ae09ba77bcb33
 2015-04-27 13:13:32 -07:00
Tyler Gunn
bde0b1e4c8 Add videoStateToString on videoProvider Class. 
- Got tired of looking at numerical integer videoStates, so added a new
"videoStateToString" static method, similar to how we have a
Connection#capabilitiesToString method.

Bug: 20257400
Change-Id: I39fcf413938c90e5993985f0976ad4fcce11505d
 2015-04-24 23:47:37 +00:00
Cheuksan Wang
890eb710f9 Merge "add injectSmsPdu with subId to ISms.aidl" into m-wireless-dev 2015-04-24 23:35:25 +00:00
Cheuksan Wang
9ddd2e78cb Update the SmsMessage.createFromPdu() API call 
Deprecate the old createFromPdu(byte[] pdu) call because it just
guesses the format of the PDU. Instead, unhide the
createFromPdu(byte[] pdu, String format) call which specifies the PDU
format.

BUG: 20015718
Change-Id: I133fc17bf5af4f762fea3106e75beea58185fd5d
 2015-04-24 22:45:46 +00:00
xinhe
ebc5ced56e No Permission check for WiFi RTT 
Bug:19918231
Change-Id: I98aea756cc15683596096e46da48efe0737ae1d1
 2015-04-24 22:17:48 +00:00
Cheuksan Wang
e87e4f077c add a parameter to carrier messaging calls to request delivery status 
In the carrier messaging API, I forgot to add the parameter to request
delivery status. We need to add one more parameter (to indicate
requesting delivery status) to these calls:

onSendMultipartTextSms
onSendTextSms
onSendDataSms

Backward compatibility is maintained in
CarrierMessagingService.java. Third-party carrier apps implementing
the old API will continue to work.

BUG: 20224743
Change-Id: I09901558e7cb75a9ec6a5bd5ba2c8117ac471932
 2015-04-24 21:51:28 +00:00
Cheuksan Wang
712cdaf48e Merge "Fail SmsManager requests if SubId is not active." into m-wireless-dev 2015-04-24 21:40:11 +00:00
Jan Nordqvist
58687715da Added parameter to avoid having a stream opened, 
and with that, file truncated on no-op.

Change-Id: I5813e4fd269c639a437e17f2554efa4db735a8ba
 2015-04-23 15:42:55 -07:00
Matthew Williams
44a05269ee am 28358eae: Merge "Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test." into lmp-mr1-dev 
automerge: 9dfe4ff

* commit '9dfe4ff46abcf0ec9cfe17a1478475a41bd2631e':
  Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test.
 2015-04-23 22:24:34 +00:00
Quddus Chong
c136973a43 am d642f829: am 54dee349: docs: Fixed broken urls in the UI testing training main page and revised intro to the \'Testing UI for a Single App\' class. 
automerge: 9dbb002

* commit '9dbb002c88fb85c8b3d7f512b789f183fe8361ad':
  docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
 2015-04-23 22:24:18 +00:00
Luan Nguyen
abf6f48e22 am b7647017: am eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs 
automerge: 29d9332

* commit '29d93329c23101e304985646c7bce71019945185':
  docs: Remove note about inablity to submit apps to Google Play.
 2015-04-23 22:24:09 +00:00
Quddus Chong
a9bd0e523a am 0c3b894c: am 91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs 
automerge: 6a08de6

* commit '6a08de6f7db0719c6e414ba36b8090836c91a873':
  docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
 2015-04-23 22:23:57 +00:00
Wale Ogunwale
b4d5b32082 am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev 
automerge: ab52a9d  -s ours

* commit 'ab52a9daa310209b27a57b61aadc704b76712c02':
  [DO NOT MERGE] Fixed NPE when trying to animate a window without display
 2015-04-23 22:23:46 +00:00
Andrew Solovay
a1a2fa791a am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs 
automerge: 8a5d295

* commit '8a5d2953e2886b610045f268dbb3b2a0a9b0249c':
  docs: Fixed formatting in android:documentLaunchMode syntax section
 2015-04-23 22:23:34 +00:00
Yuichi Araki
4da83def05 am 776cf41d: Fix a broken link in javadoc 
automerge: 678638e

* commit '678638e8e6c1373f93214bf4da76b53109b4a23d':
  Fix a broken link in javadoc
 2015-04-23 22:23:26 +00:00
Eric Gilmore
3498e6ce90 am b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs 
automerge: c90b7c6

* commit 'c90b7c623f765abcf662364b65f344ef9dcaf3da':
  Changing wording to reflect c2dm shutdown.
 2015-04-23 22:23:18 +00:00
Scott Rowe
2f11248654 am 4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs 
automerge: 20c886f

* commit '20c886fdee111ecc5766c81da6f03130dcb3a918':
  docs: Building Live TV Apps
 2015-04-23 22:23:10 +00:00
Luan Nguyen
d342e9918d am d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs 
automerge: b24bb3e

* commit 'b24bb3e3109035e627ad8a7d17728b5e6ba39405':
  docs: Update ambient mode to mention disabling bitmap filtering
 2015-04-23 22:23:02 +00:00
Luan Nguyen
edd8efe87a am 649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs 
automerge: 47789f7

* commit '47789f72761e28ae315c460fe969a2f6888b806a':
  docs: Remove misleading information about hardware layer performance benefits for optimizing views.
 2015-04-23 22:22:54 +00:00
Luan Nguyen
60b827a383 am 7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs 
automerge: bab656f

* commit 'bab656f89e9449960a658d69806e31578ab1443a':
  docs: Add voice intent for starting a stopwatch
 2015-04-23 22:22:46 +00:00
Andrew Solovay
fed470ff75 am b2255d4f: docs: Fixed a typo. 
automerge: 5600666

* commit '56006668cbd1f101010ce04418a7d056e7711fad':
  docs: Fixed a typo.
 2015-04-23 22:22:29 +00:00
Matthew Williams
9dfe4ff46a am 28358eae: Merge "Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test." into lmp-mr1-dev 
* commit '28358eaed2e1858fcba7991cbd7199a25d160471':
  Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test.
 2015-04-23 19:38:51 +00:00
Quddus Chong
9dbb002c88 am d642f829: am 54dee349: docs: Fixed broken urls in the UI testing training main page and revised intro to the \'Testing UI for a Single App\' class. 
* commit 'd642f8297529b3df96d0f822b062cb8354c90c18':
  docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
 2015-04-23 19:38:43 +00:00
Luan Nguyen
29d93329c2 am b7647017: am eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs 
* commit 'b7647017ddf8f57c7333b5ae3e459639ef0a6a7c':
  docs: Remove note about inablity to submit apps to Google Play.
 2015-04-23 19:38:39 +00:00
Quddus Chong
6a08de6f7d am 0c3b894c: am 91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs 
* commit '0c3b894c2c18b226f58af98569f21bcb4a593b14':
  docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
 2015-04-23 19:38:32 +00:00
Wale Ogunwale
ab52a9daa3 am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev 
* commit 'f61aee97adf4e543e82289511c6127bcfa53151c':
  [DO NOT MERGE] Fixed NPE when trying to animate a window without display
 2015-04-23 19:30:28 +00:00
Andrew Solovay
8a5d2953e2 am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs 
* commit 'f2ff12ba00ba7c290bc15ea28fdcf3c6d6d1029a':
  docs: Fixed formatting in android:documentLaunchMode syntax section
 2015-04-23 19:30:15 +00:00
Yuichi Araki
678638e8e6 am 776cf41d: Fix a broken link in javadoc 
* commit '776cf41d7c8f239d20397886f2120407396cfc87':
  Fix a broken link in javadoc
 2015-04-23 19:30:11 +00:00
Eric Gilmore
c90b7c623f am b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs 
* commit 'b2b93762b8165ee47f49765816fc7ba0428c371c':
  Changing wording to reflect c2dm shutdown.
 2015-04-23 19:30:06 +00:00
Scott Rowe
20c886fdee am 4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs 
* commit '4fc3d3ff404c777e07616b704c68176d9060c4e4':
  docs: Building Live TV Apps
 2015-04-23 19:30:01 +00:00
Luan Nguyen
b24bb3e310 am d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs 
* commit 'd01ada25155ed82644b9cc23313c04d3f1a5721a':
  docs: Update ambient mode to mention disabling bitmap filtering
 2015-04-23 19:29:56 +00:00
Luan Nguyen
47789f7276 am 649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs 
* commit '649d839b82a8fafc99ae79ba1ad5fc12218391cb':
  docs: Remove misleading information about hardware layer performance benefits for optimizing views.
 2015-04-23 19:29:52 +00:00
Luan Nguyen
bab656f89e am 7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs 
* commit '7542c44ee45a195404eccf50a82df7903e2ecd9c':
  docs: Add voice intent for starting a stopwatch
 2015-04-23 19:29:49 +00:00
Andrew Solovay
56006668cb am b2255d4f: docs: Fixed a typo. 
* commit 'b2255d4f10230b51de373528aaee7b12cc9e2f2b':
  docs: Fixed a typo.
 2015-04-23 19:06:29 +00:00
Svetoslav
8dfdb9898b am 37661db7: AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE 
automerge: ddd562f  -s ours

* commit 'ddd562fc6771e3a445326dae5681bb73e580ecca':
  AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
 2015-04-23 18:00:40 +00:00
Rich Slogar
eba66c376a am f80370c6: Merge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev 
automerge: 2164f70

* commit '2164f70f15391d6a00dc3b3802ff30e6bcfed301':
  docs: build tools 22.0.1 revision updates
 2015-04-23 18:00:13 +00:00
Svetoslav
ddd562fc67 am 37661db7: AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE 
* commit '37661db7fa58c0559ef2b73b6f8c38124e3acd4a':
  AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
 2015-04-23 16:22:44 +00:00
Rich Slogar
2164f70f15 am f80370c6: Merge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev 
* commit 'f80370c60118441c0022333a5b4f8cda99c86774':
  docs: build tools 22.0.1 revision updates
 2015-04-23 16:22:19 +00:00
Prerepa Viswanadham
5882f5455f Make onlost/onfound APIs public 
Change-Id: I455124478d953d652f216f71d5813782fc9633ab
 2015-04-22 12:04:38 -07:00
Lorenzo Colitti
052a0da4f7 Always send the DHCP client identifier. 
Currently we send it only in request packets, but not in discover
packets. This might confuse servers because they might think that
the discover and the request come from different clients.

Also reorder the options in the request packet to match the order
used by the legacy DHCP client.

While I'm at it, fix the generation code for inform and decline
packets, which we do not use.

Bug: 19704592
Bug: 20335221
Change-Id: I1d45306e76dbd5da9cc4611e6df84a9f67346b2c
 2015-04-22 17:26:10 +09:00
Lorenzo Colitti
f0e3a7044b Log DHCP replies that we can't parse. 
Bug: 19704592
Bug: 20335221
Change-Id: I73def02a08345bd96f45cb970f9f251e6d5df2db
 2015-04-22 17:25:17 +09:00
Erik Kline
009d4a864f Merge "Final removal of CONNECTIVITY_ACTION_IMMEDIATE." into m-wireless-dev 2015-04-22 00:36:11 +00:00
Erik Kline
2625befbb1 Final removal of CONNECTIVITY_ACTION_IMMEDIATE. 
Since the demise of the connectivity change delay,
CONNECTIVITY_ACTION_IMMEDIATE has been sent out back to back with
CONNECTIVITY_ACTION.

Interested parties should watch for CONNECTIVITY_ACTION.

Bug: 20013379
Change-Id: I072dddf95adb3bbd17fa1f7159d4ea848ade8f19
 2015-04-22 08:56:43 +09:00
Prerepa Viswanadham
db1dbb8895 Manage onfound/lost resources (1/2) 
Provide error callback to app if advertisement tracking resources
can't be reserved

Change-Id: Ie66b2ec7a64b24bbdf3bb22003a4a7eb46623792
 2015-04-21 23:19:22 +00:00
xinhe
7e5e791d22 Fix build error on API 
Change-Id: Id7024feb6baf8c6cc607702b3ac90dfbd3d483ba
 2015-04-21 15:42:03 -07:00
Yorke Lee
170102d631 DO NOT MERGE Make CAPABILITY_CAN_PAUSE_VIDEO public 
Change-Id: If20f642a3d6bda886a68bb1e0ce459c38361a73c
 2015-04-21 15:05:37 -07:00
Yorke Lee
c539080a93 DO NOT MERGE Make CAPABILITY_VIDEO_CALLING public 
Change was previously made in master

Change-Id: Ica37a2060dca35ed6c734852a12b8f9ab27cd8aa
 2015-04-21 15:03:29 -07:00