Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
165,266 Commits 3 Branches 0 Tags
445fff144d37d3b4af978decafbb4455683fdf02
Commit Graph

2050 Commits

Author SHA1 Message Date
Michael Wright
d42c1f4022 am 3f0da0bc: am 7d766833: am b5344ce5: am 57bb094b: am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev 
* commit '3f0da0bcb07ed1c7a544cc3cd88b084a42044295':
  Specify a device identifier for keyboard layout notification.
 2014-09-26 15:27:05 +00:00
Michael Wright
2e4c96f879 am 7d766833: am b5344ce5: am 57bb094b: am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev 
* commit '7d7668330efa99bdab44e8cc4d240ae0e05a0abb':
  Specify a device identifier for keyboard layout notification.
 2014-09-26 04:29:22 +00:00
Michael Wright
e27380ac46 am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev 
* commit '233bbabfe10bbf7190cdf3a6bb44f081a1fa91c7':
  Specify a device identifier for keyboard layout notification.
 2014-09-25 22:27:05 +00:00
Michael Wright
c93fbd1fae Specify a device identifier for keyboard layout notification. 
Bug: 17614683
Change-Id: If53489b09212bfa487d7dc3a7f9b000731d949ac
 2014-09-23 14:59:23 -07:00
Wink Saville
40aca89a27 am c501947a: Merge commit \'edd57a98\' into fix-conflict 
* commit 'c501947a3ebed84792c235f29c73194d095906ed':
 2014-09-19 06:44:44 +00:00
Wink Saville
9bb67459b6 Merge commit 'edd57a98' into fix-conflict 
* commit 'edd57a98':

Conflicts:
	core/java/android/provider/CallLog.java
	telephony/java/android/telephony/TelephonyManager.java

Change-Id: Ia16537ede73f7b2e2c22ca1ff664a32bd6c272fa
 2014-09-16 13:23:43 -07:00
Tyler Gunn
6c8d6d74c0 resolved conflicts for merge of 66c16547 to lmp-sprout-dev 
Also fixed issue in TelephonyManager.

Change-Id: I4dde45e638c2bcf32f8f929d34d0083966f6761f
 2014-09-13 20:10:08 +00:00
Tyler Gunn
cc616bca0d am b51263b9: am 21282583: am 66c16547: Merge "Renaming Telecomm to Telecom." into lmp-dev 
* commit 'b51263b99fc2c8293e1f0fe844e65ce2afec2089':
  Renaming Telecomm to Telecom.
 2014-09-13 18:19:31 +00:00
Tyler Gunn
8bc3996189 am 21282583: am 66c16547: Merge "Renaming Telecomm to Telecom." into lmp-dev 
* commit '2128258322aa2f90d65c1963ede79d1bffb3fce4':
  Renaming Telecomm to Telecom.
 2014-09-13 18:03:04 +00:00
Tyler Gunn
ef9f6f957d Renaming Telecomm to Telecom. 
- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: I192cb5d189f55db012ea72ee82ccc5aedbc21638
 2014-09-12 22:16:17 -07:00
Julia Reynolds
056c6d0e95 am b5f388f8: am a098030f: am 086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev 
* commit 'b5f388f8f6b94dae5b8a4d4eb68316d52df4cdcd':
  Allow device owners to update LOCATION_MODE.
 2014-09-12 19:17:02 +00:00
Julia Reynolds
3fb8348ecd am a098030f: am 086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev 
* commit 'a098030f70a4861a4c0f7241d8a95f1d6441e5ed':
  Allow device owners to update LOCATION_MODE.
 2014-09-11 16:04:20 +00:00
Julia Reynolds
c889315c66 am 086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev 
* commit '086bf8e1ef3beac49adea005a1e3275605cd4a41':
  Allow device owners to update LOCATION_MODE.
 2014-09-11 16:02:45 +00:00
Julia Reynolds
d86734b469 Merge "Allow device owners to update LOCATION_MODE." into lmp-dev 2014-09-11 15:46:07 +00:00
Adrian Roos
b6b356c07e am c52a9597: am 99006f6c: am be125380: Merge "Add system trust agents on first boot or when adding user" into lmp-dev 
* commit 'c52a95973ebacd5afcd6b2ae4937983726493d25':
  Add system trust agents on first boot or when adding user
 2014-09-11 14:12:53 +00:00
Adrian Roos
444c6581ef am 99006f6c: am be125380: Merge "Add system trust agents on first boot or when adding user" into lmp-dev 
* commit '99006f6cd5d64fa6accd4301646b4a58ac992d62':
  Add system trust agents on first boot or when adding user
 2014-09-10 11:41:21 +00:00
Adrian Roos
f1fe1a3ac4 am be125380: Merge "Add system trust agents on first boot or when adding user" into lmp-dev 
* commit 'be12538056cf441f441d42d2bf7d430ecdc3fd4f':
  Add system trust agents on first boot or when adding user
 2014-09-10 11:32:07 +00:00
Adrian Roos
3870d451f7 Add system trust agents on first boot or when adding user 
While we're in there also call listeners when they're added
so they know the state immediately.

Bug: 17258031
Change-Id: I5f1186314795f3fafd78e1b3e2d5102cdaec65d6
 2014-09-10 00:02:38 +02:00
Yorke Lee
5782a15f9c am 903343c2: am 37a32c03: am af99dec4: Merge "Replace Calls.FEATURES_NONE with 0 (1/4)" into lmp-dev 
* commit '903343c228f611b5634cbc22bf000fbf0129d287':
  Replace Calls.FEATURES_NONE with 0 (1/4)
 2014-09-08 22:27:01 +00:00
Yorke Lee
b8bf1691cc am 37a32c03: am af99dec4: Merge "Replace Calls.FEATURES_NONE with 0 (1/4)" into lmp-dev 
* commit '37a32c038db23533ab1bcc0b14fa48ed61e74a60':
  Replace Calls.FEATURES_NONE with 0 (1/4)
 2014-09-08 22:03:12 +00:00
Yorke Lee
8dc2c62821 am af99dec4: Merge "Replace Calls.FEATURES_NONE with 0 (1/4)" into lmp-dev 
* commit 'af99dec488b5eae712253d24ce9f1e85ccfefdeb':
  Replace Calls.FEATURES_NONE with 0 (1/4)
 2014-09-08 21:50:35 +00:00
Yorke Lee
e3198b719f Replace Calls.FEATURES_NONE with 0 (1/4) 
Bug: 17253963
Change-Id: I9e9e56cdf4c9a60ac1e047bef0eba2ba0c8f10fb
 2014-09-08 13:33:51 -07:00
Elliott Hughes
a559a68c36 am d2f9559a: Merge "resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp 
* commit 'd2f9559ad7cff93527a05cb85172a7bb29f4d9b2':
  Small documentation fixes across many files.
 2014-09-08 20:15:07 +00:00
Elliott Hughes
4656e69bf3 resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp 
Change-Id: I5148eda624e8504f12dbc1288cd4a7a5b7c10850
 2014-09-08 13:08:43 -07:00
Mark Doliner
d0646dca40 Small documentation fixes across many files. 
Change-Id: I3e8787ce4bc6018ea1dc9aef2a2cd4e0a8dde663
 2014-09-05 13:57:51 -07:00
Yorke Lee
085146635a am 515f49b3: am 159a547b: am 52cd366d: Merge "ContactsContract API changes per API review" into lmp-dev 
* commit '515f49b3f34ac3ebe768ab005e9d439886bde921':
  ContactsContract API changes per API review
 2014-09-05 00:51:48 +00:00
Yorke Lee
d500584234 am 52cd366d: Merge "ContactsContract API changes per API review" into lmp-dev 
* commit '52cd366d9d094af6b8c3b4e91e54d00a88f50cb8':
  ContactsContract API changes per API review
 2014-09-05 00:29:17 +00:00
Yorke Lee
78814623e0 ContactsContract API changes per API review 
Bug: 17390425
Change-Id: Ia88fb0235a56becc3ec5a770067856311769a68c
 2014-09-04 16:51:53 -07:00
Julia Reynolds
82735bcb14 Allow device owners to update LOCATION_MODE. 
Bug: 17388933
Change-Id: If3267aa52c2611cf764a19bee019c312f6ebf5d1
 2014-09-04 16:43:30 -04:00
Tyler Gunn
392f24dc8d am 51023e0e: am a8c7d1bc: am 78c0d4ab: Merge "Remove "ask each time" SIP call setting. (1/2)" into lmp-dev 
* commit '51023e0e394d33773a4dd4650190fd1b41131303':
  Remove "ask each time" SIP call setting. (1/2)
 2014-09-02 18:12:29 +00:00
Dianne Hackborn
43f75b4db1 am 347a8167: am 4e784a50: am 4b9a934c: Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev 
* commit '347a81674350d3848e513f678cbf689074b935fd':
  Hide the interaction part of VoiceInteractionService.
 2014-09-02 18:12:20 +00:00
Tyler Gunn
bd4ca2b4b4 am 78c0d4ab: Merge "Remove "ask each time" SIP call setting. (1/2)" into lmp-dev 
* commit '78c0d4ab75c61efc48af1a698fd7d36620523866':
  Remove "ask each time" SIP call setting. (1/2)
 2014-09-02 17:42:11 +00:00
Dianne Hackborn
8bce896373 am 4b9a934c: Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev 
* commit '4b9a934cef4de4985c0e316ef89ca41b3e720135':
  Hide the interaction part of VoiceInteractionService.
 2014-09-02 17:42:08 +00:00
Tyler Gunn
4b7498d81f Merge "Remove "ask each time" SIP call setting. (1/2)" into lmp-dev 2014-09-02 17:31:39 +00:00
Dianne Hackborn
76a65d5f00 Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev 2014-09-02 17:30:49 +00:00
Dianne Hackborn
d7c0395d26 Hide the interaction part of VoiceInteractionService. 
Also the ability to start voice activities is turned off,
though for testing purposes it can be turned back on with a system
property.

Change-Id: I867704d32c53beeb851ceea9b45c28bf5c01ef61
 2014-09-02 10:29:28 -07:00
Tyler Gunn
2c830a2905 Remove "ask each time" SIP call setting. (1/2) 
1. Removed setting from Settings.System class.
2. Added settings database migration step to change "SIP_ASK_ME_EACH_TIME"
to "SIP_ADDRESS_ONLY" as the "ask me each time" option no longer makes
sense given the new phone accounts settings.

Bug: 17321422
Change-Id: I3df1be4fcda44f2097c49af44508ac1fce72a24b
 2014-09-02 08:39:35 -07:00
Chris Wren
d6c6cd80f0 am 7c528397: am a69ad7a3: am 7d0a2a7f: Merge "Disable lockscreen notifications for secure users on upgrade." into lmp-dev 
* commit '7c528397b54ca5b6cb865e7ba37754f3a831830c':
  Disable lockscreen notifications for secure users on upgrade.
 2014-09-02 07:09:56 +00:00
Wink Saville
05e6dde3a0 ksd to lmp-sprout-dev 
Change-Id: I94eb65c62231b5831570bb0cbbbd9c916bee0a37
 2014-09-01 05:38:31 +00:00
Chris Wren
4775109ec1 Merge "Disable lockscreen notifications for secure users on upgrade." into lmp-dev 2014-08-29 21:25:43 +00:00
Chris Wren
cd8f4f71fc Disable lockscreen notifications for secure users on upgrade. 
Add a notification for those users that teaches them how to re-enable
the notifications.

Bug: 15934899
Depends-On: Ie0bcc207c4f331def207e588bbad36b8986fe114
Change-Id: I4a169e268042cfcaa4ad80cdf205904f9c90e76d
 2014-08-29 20:49:36 +00:00
Julia Reynolds
5fd5d461d2 am e7472cec: am fa39108f: am d266bd44: Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev 
* commit 'e7472cec1f01174c6dfdbbbd1287dcde56c1a21e':
  Audio/Micrphone user restriction/multiuser updates.
 2014-08-28 20:10:38 +00:00
Julia Reynolds
a8528c6420 Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev 2014-08-28 19:41:42 +00:00
Nancy Chen
c39c6f06a8 am a13366b6: am 48add9d4: am 2ead90e0: Merge "Add field for sub_id in call log for sprout database." into lmp-dev 
* commit 'a13366b6279b047ad7bb4e0b2e8ef5e997e02b8a':
  Add field for sub_id in call log for sprout database.
 2014-08-28 18:30:39 +00:00
Nancy Chen
d1a5a46368 Merge "Add field for sub_id in call log for sprout database." into lmp-dev 2014-08-28 17:55:50 +00:00
Jeff Sharkey
d380f5604f am bc55cead: am cb1236be: am 7cb28e7b: Merge "Define EXTRA_SIZE for ContentProviders." into lmp-dev 
* commit 'bc55cead16c51a846c3fc1c8afd2aaf3d02e0b25':
  Define EXTRA_SIZE for ContentProviders.
 2014-08-28 16:47:39 +00:00
Jeff Sharkey
ca5186e9d5 Merge "Define EXTRA_SIZE for ContentProviders." into lmp-dev 2014-08-28 16:12:47 +00:00
Nancy Chen
3a78092127 Add field for sub_id in call log for sprout database. 
Adding sub_id as a column in the calls table to make the sprout and
non-sprout contacts databases consistent.

Bug: 14990572
Change-Id: I82d9fe65e6cdf4e10b6115a8565c2be3a6f93562
 2014-08-28 08:47:27 -07:00
Yorke Lee
af74216c4e am 64c86ede: am 9aedb262: am e4ba7f2b: Merge "Update value of EXTRA_CALL_TYPE_FILTER" into lmp-dev 
* commit '64c86edeb93c8b7dcde4c2a6288414e3ab416055':
  Update value of EXTRA_CALL_TYPE_FILTER
 2014-08-28 04:17:16 +00:00
Yorke Lee
52e7750184 Update value of EXTRA_CALL_TYPE_FILTER 
Bug: 17253963
Change-Id: I1e98fc2a25b0bc807b0b4d1af2941da6660e09e0
 2014-08-27 16:28:12 -07:00