Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
256,895 Commits 3 Branches 0 Tags
87f3aeeee2a9859cd312c3f1d8a18946cf8f582b
Commit Graph

256895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sanket Padawe
232667bdda Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent. 
Bug: 24450765
Change-Id: I42c9f9b2b1c34d774c28d8431bc7c21bbf5909fd
 2016-05-16 19:02:39 +00:00
Android Build Merger (Role)
aa19c3e55c Merge "Merge "Throw exception on rule creation failure." into nyc-dev am: 252a6b125b am: d1aad831ab" into nyc-mr1-dev-plus-aosp 2016-05-16 18:36:55 +00:00
Julia Reynolds
2ab6cddcef Merge "Throw exception on rule creation failure." into nyc-dev am: 252a6b125b 
am: d1aad831ab

* commit 'd1aad831ab6e20c91e06afed08514d5959bb4307':
  Throw exception on rule creation failure.

Change-Id: I9c8f30841b918ccd5713f0f9a37595468106d0b7
 2016-05-16 18:35:48 +00:00
Julia Reynolds
1f1995457b Merge "Throw exception on rule creation failure." into nyc-dev am: 252a6b125b 
am: 2e1c9f1539

* commit '2e1c9f1539b4947fdd9167ae269d6198fc073b9f':
  Throw exception on rule creation failure.

Change-Id: Ic90033899d79b1b23ded700502c0e07b137ed2f8
 2016-05-16 18:34:13 +00:00
Julia Reynolds
2e1c9f1539 Merge "Throw exception on rule creation failure." into nyc-dev 
am: 252a6b125b

* commit '252a6b125bdaced7d928167e0fbc4dd2ba95e8a1':
  Throw exception on rule creation failure.

Change-Id: I105b73c9888b6c871a1ab7863a79ca79f4d1d8a7
 2016-05-16 18:29:16 +00:00
Julia Reynolds
d1aad831ab Merge "Throw exception on rule creation failure." into nyc-dev 
am: 252a6b125b

* commit '252a6b125bdaced7d928167e0fbc4dd2ba95e8a1':
  Throw exception on rule creation failure.

Change-Id: Ida05baa0dbaaefcc3738114d60173e312e7c2830
 2016-05-16 18:29:11 +00:00
Julia Reynolds
252a6b125b Merge "Throw exception on rule creation failure." into nyc-dev 2016-05-16 18:22:17 +00:00
Bert McMeen
a483d10070 Docs: Iterating on Wear docs - Bridger API 
Bug: 28561056
Change-Id: Ia3787e9ed0d467331a1e495a534a130dd1859a5b
 2016-05-16 11:18:08 -07:00
Android Build Merger (Role)
c07174d36d Merge "Merge "Fixing a NPE in DevicePolicyManagerService" into nyc-dev am: 6c917901cf am: a582dd0090" into nyc-mr1-dev-plus-aosp 2016-05-16 17:50:01 +00:00
Ashley Smith
cc714551e8 Merge "Fixing a NPE in DevicePolicyManagerService" into nyc-dev am: 6c917901cf 
am: a582dd0090

* commit 'a582dd00907786132ad8eac650965718fa9e7ba9':

Change-Id: I16044e14b9e3dc2108ab48571225cae027abbc20
 2016-05-16 17:49:39 +00:00
Vineeta Srivastava
c7d7ab7fab wifi calling emergency address carrier config 
Add a carrier config for providing emergency address to carriers for
WiFi Calling use case.

Bug: 28404126
Change-Id: I33ed973d5ce6c9503412d5d97aa7278aaae888b5
 2016-05-16 10:49:01 -07:00
Android Build Merger (Role)
93cdcf58d6 Merge "Merge "Fixing a NPE in DevicePolicyManagerService" into nyc-dev am: 6c917901cf am: a582dd0090" into nyc-mr1-dev-plus-aosp 2016-05-16 17:47:49 +00:00
Ashley Smith
d8c3b39c59 Merge "Fixing a NPE in DevicePolicyManagerService" into nyc-dev am: 6c917901cf 
am: a582dd0090

* commit 'a582dd00907786132ad8eac650965718fa9e7ba9':
  Fixing a NPE in DevicePolicyManagerService

Change-Id: Ifc64f674f02e707eec85a407c31dd20030dbfda0
 2016-05-16 17:47:12 +00:00
Ashley Smith
db5d4d47cf Merge "Fixing a NPE in DevicePolicyManagerService" into nyc-dev am: 6c917901cf 
am: 03905d07ac

* commit '03905d07ac22b7bb79b0bc4a63308fd599b136da':
  Fixing a NPE in DevicePolicyManagerService

Change-Id: I4d64e07d16f3ba32d99ea0f7140ae5380e91cef3
 2016-05-16 17:47:10 +00:00
Ashley Smith
03905d07ac Merge "Fixing a NPE in DevicePolicyManagerService" into nyc-dev 
am: 6c917901cf

* commit '6c917901cf4e6f64300398f564436a7d1fc18b10':
  Fixing a NPE in DevicePolicyManagerService

Change-Id: I622bbcf2672ddb0da604fe434928904add826da5
 2016-05-16 17:44:12 +00:00
Ashley Smith
a582dd0090 Merge "Fixing a NPE in DevicePolicyManagerService" into nyc-dev 
am: 6c917901cf

* commit '6c917901cf4e6f64300398f564436a7d1fc18b10':
  Fixing a NPE in DevicePolicyManagerService

Change-Id: I540f2d5e490e70c19e5e8d8926010bbcb1431048
 2016-05-16 17:44:09 +00:00
Ashley Smith
6c917901cf Merge "Fixing a NPE in DevicePolicyManagerService" into nyc-dev 2016-05-16 17:40:24 +00:00
Ta-wei Yen
349f4eddf7 Add visual voicemail SMS filter APIs 
Added the following APIs to the framework:
VoicemailContracts.ACTION_VOICEMAIL_SMS_RECEIVED
VoicemailContracts.EXTRA_VOICEMAIL_SMS_TYPE
VoicemailContracts.EXTRA_VOICEMAIL_SMS_DATA
VoicemailContracts.EXTRA_VOICEMAIL_SMS_SUBID

TelphonyManager.setVisualVoicemailSmsFilterEnabled()
TelphonyManager.isVisualVoicemailSmsFilterEnabled()
TelphonyManager.setVisualVoicemailSmsFilterPrefix()
TelphonyManager.getVisualVoicemailSmsFilterPrefix()
TelphonyManager.setVisualVoicemailSmsFilterOriginatingNumbers()
TelphonyManager.getVisualVoicemailSmsFilterOriginatingNumbers()
TelphonyManager.setVisualVoicemailSmsFilterDestinationPort()
TelphonyManager.getVisualVoicemailSmsFilterDestinationPort()
TelphonyManager.VVM_SMS_FILTER_DESTINATION_PORT_ANY
TelphonyManager.VVM_SMS_FILTER_DESTINATION_PORT_DATA_SMS

These values are required to implement the VisualVoicemailSmsFilter in
frameworks/opt/telephony

All of the APIs are hidden.

Bug:27816386
Bug:27817303
Change-Id: I07736785da5fece84d1f3d27f270ac6fa94c1c56
(cherry picked from commit ecbcce11ce)
 2016-05-16 17:37:48 +00:00
Alan Viverette
c3e5a82691 Use standalone capitalization for month labels 
Bug: 28020439
Change-Id: I85169a78142a43ff2348e0b561a7aa995544a65e
 2016-05-16 13:35:56 -04:00
Clara Bayarri
ab591ba4b6 Remove "if it succeeds" wording from requestShowKeyboardShortcuts 
Bug: 28775576
Change-Id: Ib7bc2d78cc074c14384f5a86437c684462f1fb54
 2016-05-16 17:48:16 +01:00
Phil Weaver
1d4e18340e Content description for FloatingToobar overflow. 
Was missing a content description. The same button is used for
both opening and closing the toolbar, so it needs to be updated
dynamically.

Bug: 28750935
Change-Id: I7f75701ae6af45e5621c36b81003b658479e8b31
 2016-05-16 09:41:14 -07:00
Alan Viverette
582dcac856 Update docs for ColorStateList to include alpha 
Bug: 28760030
Change-Id: I309364002220b9896f5ddf29dabde79636a722e9
 2016-05-16 12:37:55 -04:00
Android Build Merger (Role)
5683dde60c Merge "Merge "TIF: Update TvInputInfo when the input is reinstalled." into nyc-dev am: b0d38b6d47 am: d73ece967a" into nyc-mr1-dev-plus-aosp 2016-05-16 16:36:08 +00:00
Shubang Lu
c4a10b9c05 Merge "TIF: Update TvInputInfo when the input is reinstalled." into nyc-dev am: b0d38b6d47 
am: d73ece967a

* commit 'd73ece967a28ae793fc5aebd2df003b5df95df15':

Change-Id: I7ef502458c935b73d27e19bdbd00b8ca94f03300
 2016-05-16 16:35:42 +00:00
Android Build Merger (Role)
72c22cb595 Merge "Merge "TIF: Update TvInputInfo when the input is reinstalled." into nyc-dev am: b0d38b6d47 am: d73ece967a" into nyc-mr1-dev-plus-aosp 2016-05-16 16:33:47 +00:00
Shubang Lu
1df645c3fe Merge "TIF: Update TvInputInfo when the input is reinstalled." into nyc-dev am: b0d38b6d47 
am: d73ece967a

* commit 'd73ece967a28ae793fc5aebd2df003b5df95df15':
  TIF: Update TvInputInfo when the input is reinstalled.

Change-Id: I1d7d01e8690d9b4dd9535017e27386b85c0e087e
 2016-05-16 16:33:27 +00:00
Shubang Lu
37d308db8a Merge "TIF: Update TvInputInfo when the input is reinstalled." into nyc-dev am: b0d38b6d47 
am: 4f8aef308f

* commit '4f8aef308fb0ddbf02129322f62ef9d1d3d5fca6':
  TIF: Update TvInputInfo when the input is reinstalled.

Change-Id: I50e8be71465bf9af7b0547084f3e487120d8f8df
 2016-05-16 16:33:25 +00:00
Shubang
4f8aef308f Merge "TIF: Update TvInputInfo when the input is reinstalled." into nyc-dev 
am: b0d38b6d47

* commit 'b0d38b6d47a9f7e94135fc64449e81f9dc47f3eb':
  TIF: Update TvInputInfo when the input is reinstalled.

Change-Id: I8d81b63c179d1c04a1168df191fe3cb9538a853c
 2016-05-16 16:30:28 +00:00
Shubang
d73ece967a Merge "TIF: Update TvInputInfo when the input is reinstalled." into nyc-dev 
am: b0d38b6d47

* commit 'b0d38b6d47a9f7e94135fc64449e81f9dc47f3eb':
  TIF: Update TvInputInfo when the input is reinstalled.

Change-Id: I9203108969432744c0e50bf7fbe8dfe95562cb58
 2016-05-16 16:30:22 +00:00
Ricky Wai
b0cdf3845f Do not tie managed profile synchronously in onUnlockUser() 
Bug: 28736098
Change-Id: I2c687c11b9991d0771cfe721e80ac1541c477f2e
 2016-05-16 17:29:17 +01:00
Shubang Lu
b0d38b6d47 Merge "TIF: Update TvInputInfo when the input is reinstalled." into nyc-dev 2016-05-16 16:25:08 +00:00
Michael Kwan
09c3f2d002 Allow ANR dialogs for Watch eng builds. 
Bug: 20024319
Change-Id: Idf966155c2b1e081f59d55b09e544d2c2adfbd2b
 2016-05-16 09:22:26 -07:00
Ashley Smith
820ae5a475 Fixing a NPE in DevicePolicyManagerService 
Bug: 28786940
Change-Id: I73de8dea9221765ed0751039f3d472cf78d341af
 2016-05-16 15:55:14 +00:00
Android Build Merger (Role)
a4b0d4c659 Merge "Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev am: cef3337cb5 am: 6b078fef33" into nyc-mr1-dev-plus-aosp 2016-05-16 15:37:09 +00:00
Yohei Yukawa
8c7a9a43d5 Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev am: cef3337cb5 
am: 6b078fef33

* commit '6b078fef33ceae160f8f6e6a2d6e0c14c61e5f06':

Change-Id: I446c2fe219a9cde2c06b78bcf4d499102af1237b
 2016-05-16 15:36:46 +00:00
Android Build Merger (Role)
de9af77093 Merge "Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev am: cef3337cb5 am: 6b078fef33" into nyc-mr1-dev-plus-aosp 2016-05-16 15:34:57 +00:00
Yohei Yukawa
88fd93d404 Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev am: cef3337cb5 
am: 6b078fef33

* commit '6b078fef33ceae160f8f6e6a2d6e0c14c61e5f06':
  Make IMS#clearInsetOfPreviousIme() reliable.

Change-Id: Id356cafd72b61fb4560e1e5b23919db5eef173cc
 2016-05-16 15:34:20 +00:00
Yohei Yukawa
c7aeaff113 Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev am: cef3337cb5 
am: a1c905caf3

* commit 'a1c905caf3fe89beec6df12b423c6cab33c40879':
  Make IMS#clearInsetOfPreviousIme() reliable.

Change-Id: Ifbbbd96c2453a1aa6d933dda6fbd7ebbfdf132a7
 2016-05-16 15:34:19 +00:00
Yohei Yukawa
a1c905caf3 Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev 
am: cef3337cb5

* commit 'cef3337cb5e27d4f571fb350be055c26d339833d':
  Make IMS#clearInsetOfPreviousIme() reliable.

Change-Id: I76b607cd8086f421fc0d552a348a70fc06aa3d9c
 2016-05-16 15:31:05 +00:00
Yohei Yukawa
6b078fef33 Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev 
am: cef3337cb5

* commit 'cef3337cb5e27d4f571fb350be055c26d339833d':
  Make IMS#clearInsetOfPreviousIme() reliable.

Change-Id: Ie654d6bccd6d4425e0dbefe2833424abdfe52a4d
 2016-05-16 15:31:03 +00:00
Android Build Merger (Role)
41d1ac7124 Merge "Merge "Remove onUhandledInputEvent API." into nyc-dev am: a1e4cbe211 am: eb1ca626f0" into nyc-mr1-dev-plus-aosp 2016-05-16 15:30:45 +00:00
Michael Wright
de2e8b226f Merge "Remove onUhandledInputEvent API." into nyc-dev am: a1e4cbe211 
am: eb1ca626f0

* commit 'eb1ca626f09b87d0ab22435d14682072ad2d6a87':

Change-Id: I76771ba60a65c80c0183efb3b45d245ec7a63fb1
 2016-05-16 15:30:13 +00:00
Android Build Merger (Role)
66a94c242f Merge "Merge "Remove onUhandledInputEvent API." into nyc-dev am: a1e4cbe211 am: eb1ca626f0" into nyc-mr1-dev-plus-aosp 2016-05-16 15:28:13 +00:00
Michael Wright
2c5cc33921 Merge "Remove onUhandledInputEvent API." into nyc-dev am: a1e4cbe211 
am: eb1ca626f0

* commit 'eb1ca626f09b87d0ab22435d14682072ad2d6a87':
  Remove onUhandledInputEvent API.

Change-Id: Iee8cfedb47e10a658d09eddf6a9853bb4d61736a
 2016-05-16 15:27:38 +00:00
Michael Wright
56ef817f1e Merge "Remove onUhandledInputEvent API." into nyc-dev am: a1e4cbe211 
am: 9e0ff89010

* commit '9e0ff89010dd2003bc9952ffedcf0f6c8d080cbb':
  Remove onUhandledInputEvent API.

Change-Id: I067333a191a5d581f397f5e9c09f6b7feae8d1f5
 2016-05-16 15:27:37 +00:00
Michael Wright
9e0ff89010 Merge "Remove onUhandledInputEvent API." into nyc-dev 
am: a1e4cbe211

* commit 'a1e4cbe2116bef9fad7c98836926317bde95d33e':
  Remove onUhandledInputEvent API.

Change-Id: I13835ddbe40330694763d34d37e01b8deeb701d7
 2016-05-16 15:24:10 +00:00
Michael Wright
eb1ca626f0 Merge "Remove onUhandledInputEvent API." into nyc-dev 
am: a1e4cbe211

* commit 'a1e4cbe2116bef9fad7c98836926317bde95d33e':
  Remove onUhandledInputEvent API.

Change-Id: I206665559c16852a6405af7081481c4e7c17cf81
 2016-05-16 15:24:08 +00:00
Yohei Yukawa
cef3337cb5 Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev 2016-05-16 15:22:21 +00:00
TreeHugger Robot
a1e4cbe211 Merge "Remove onUhandledInputEvent API." into nyc-dev 2016-05-16 15:18:20 +00:00
Android Build Merger (Role)
898d0a9907 Merge "Merge "Rename requestKeyboardShortcutsHelper" into nyc-dev am: d34396443e am: f76e417c52" into nyc-mr1-dev-plus-aosp 2016-05-16 15:14:58 +00:00