drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
160,739 Commits 1 Branch 0 Tags
1123a3eb52
Commit Graph

160739 Commits

Author SHA1 Message Date
Joe Fernandez
6e3276c106 am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev 
automerge: 287f257

* commit '287f2571ad213efd5a564df0ae69f432ab9e5c54':
  docs: Add Android 5.1 to the uses-sdk manifest docs
 2015-03-03 18:09:37 +00:00
Joe Fernandez
46d48f97b4 am 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev 
automerge: 622c011

* commit '622c0119d6c3bc4bc5d00a940f3a511992b7aae4':
  docs: Android 5.1 API Release notes (Lollipop MR1)
 2015-03-03 18:09:28 +00:00
Joe Fernandez
9a447bcc6e am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs 
* commit '246a3a4a797edf5850073ec8f6b8aa997947d09b':
  Minor typo fixes in managed profile Javadoc reference pages.
 2015-03-03 17:54:27 +00:00
Rich Slogar
7a3dc08a28 am a81ed3cd: docs: support library updates for sdk 22 
* commit 'a81ed3cd0f73138832c8386ee66dcbf2b4dce928':
  docs: support library updates for sdk 22
 2015-03-03 17:54:23 +00:00
Rich Slogar
7de9d3be04 am e0ce0f2c: docs: platform revisions 5.1 
* commit 'e0ce0f2cc28720316902303209f923e699d604f7':
  docs: platform revisions 5.1
 2015-03-03 17:54:18 +00:00
Joe Fernandez
a5587b9710 am 54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev 
* commit '546433328d0b017419bd3d5ff6ee5708645455db':
  Doc change: Add diff report for API 22.
 2015-03-03 17:54:14 +00:00
Joe Fernandez
0a1d5ca433 am 2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev 
* commit '2ba57444e8368ab66ae43fe2304e39dc76fc64ff':
  docs: update Android docs build to include API 22, Android 5.1
 2015-03-03 17:54:10 +00:00
Rich Slogar
b068c14729 am 3f3f842c: am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs 
* commit '3f3f842cc06e0103041e7dae4c3f9fbf1f7ab9c0':
  docs: sdk tools 24.1 update
 2015-03-03 17:54:06 +00:00
Joe Fernandez
287f2571ad am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev 
* commit '45ef73b4e97a0621ba5f26eef280f6550c81338d':
  docs: Add Android 5.1 to the uses-sdk manifest docs
 2015-03-03 17:54:02 +00:00
Joe Fernandez
622c0119d6 am 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev 
* commit '5c6476aa507577422557d8434a7ce19937cfccfd':
  docs: Android 5.1 API Release notes (Lollipop MR1)
 2015-03-03 17:53:58 +00:00
Paul Jensen
44f72397be Correct "Sign-in" and "Sign into" to "Sign in to". 
bug:19416574
Change-Id: I55cedd2a3e1c1c3192ece860f37c82a55cb6d7c0
 2015-03-03 15:46:36 +00:00
Erik Kline
46bdfa90c9 Merge "Refactor NetworkUtils interaction with DHCP." into m-wireless-dev 2015-03-03 06:34:07 +00:00
Joe Fernandez
246a3a4a79 am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs 
* commit '14fcef3bf02f46a057676d7a6d755daee735c4ea':
  Minor typo fixes in managed profile Javadoc reference pages.
 2015-03-03 06:29:33 +00:00
Joe Fernandez
14fcef3bf0 am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs 
* commit 'c4418980a083c1cd26b789297f084e03036b5fdd':
  Minor typo fixes in managed profile Javadoc reference pages.
 2015-03-03 06:22:42 +00:00
Joe Fernandez
c4418980a0 am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs 
* commit 'a31378dc49868412a2e632bcc46a44877a9b397f':
  Minor typo fixes in managed profile Javadoc reference pages.
 2015-03-03 06:15:29 +00:00
Joe Fernandez
a31378dc49 Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs 2015-03-03 06:11:50 +00:00
Rich Slogar
a81ed3cd0f docs: support library updates for sdk 22 
Change-Id: I4cb14e6c941652fe02d98ffac32451eea6f4576c
 2015-03-02 22:07:07 -08:00
Shishir Agrawal
335b59f847 am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev 
automerge: 4322c8d

* commit '4322c8d54ef935a3224c8fcbf7ab55ac48f34f1b':
  Fix incorrect condition for sub id check.
 2015-03-03 03:11:47 +00:00
Rich Slogar
e0ce0f2cc2 docs: platform revisions 5.1 
Change-Id: Iabbd8617e3d334228fec94254160f2e43cdd22c6
 2015-03-02 18:55:44 -08:00
Shishir Agrawal
4322c8d54e am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev 
* commit 'bcced5b834e49bf3a0b57a0009958ba061d31e76':
  Fix incorrect condition for sub id check.
 2015-03-03 02:54:12 +00:00
Joe Fernandez
546433328d Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev 2015-03-03 02:03:45 +00:00
Joe Fernandez
2ba57444e8 Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev 2015-03-03 01:42:41 +00:00
Rich Slogar
3f3f842cc0 am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs 
* commit 'd54fe112a24ec3a692d35a4ccf1f73fa5caaaf5e':
  docs: sdk tools 24.1 update
 2015-03-03 01:27:07 +00:00
Andrew Solovay
27f5337841 Minor typo fixes in managed profile Javadoc reference pages. 
See first comment for stage location.

bug: 19389235
Change-Id: I2e1d5169a77e3f4000e73f08d493953ce4eee78c
 2015-03-02 17:22:18 -08:00
Rich Slogar
d54fe112a2 am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs 
* commit '2cbda290f66b5a17d3542ada26f7e91b3893f72d':
  docs: sdk tools 24.1 update
 2015-03-03 01:20:33 +00:00
Rich Slogar
2cbda290f6 am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs 
* commit '69b58e74e087159ed5950632b4ab3738a841c633':
  docs: sdk tools 24.1 update
 2015-03-03 01:13:36 +00:00
Rich Slogar
69b58e74e0 Merge "docs: sdk tools 24.1 update" into lmp-docs 2015-03-03 01:07:44 +00:00
Joe Fernandez
45ef73b4e9 Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev 2015-03-03 01:02:55 +00:00
Joe Fernandez
5c6476aa50 Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev 2015-03-03 00:56:43 +00:00
Joe Fernandez
2c25106ab4 docs: Add Android 5.1 to the uses-sdk manifest docs 
Change-Id: Idf9962af4250e68ed885571a57b9a51a40f74267
 2015-03-02 16:43:14 -08:00
Joe Fernandez
3d44c0faca docs: update Android docs build to include API 22, Android 5.1 
Change-Id: If41c1a142db0f2df439afaa9cf5d0fe0ca47d2c0
 2015-03-02 15:53:38 -08:00
Joe Fernandez
50d0953a86 docs: Android 5.1 API Release notes (Lollipop MR1) 
Change-Id: I47f59ade26086b8368d8b395f92992edc27510d0
 2015-03-02 15:35:07 -08:00
Shishir Agrawal
bcced5b834 Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev 2015-03-02 22:32:17 +00:00
Deepanshu Gupta
969b027852 am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev 
automerge: 2b24d07

* commit '2b24d07a87513f3c547a5c279b9b3b5160cec7f0':
  Correct PorterDuff filters.
 2015-03-02 22:26:09 +00:00
Deepanshu Gupta
e99bef0ce3 am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev 
automerge: 5e84b29

* commit '5e84b292337ec48f0c8a40c137a57b4668470c85':
  Fix codestyle for switch statements.
 2015-03-02 22:24:28 +00:00
Deepanshu Gupta
b2c8848847 am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev 
automerge: ab02793

* commit 'ab027932d091932808f8fcc45f3b18fe5b3a6108':
  Better error msg for StateList/Hexadecimal Color.
 2015-03-02 22:21:35 +00:00
Etan Cohen
3ec7681440 Update API. 
Change-Id: Ia60cdb94cb929f8ffb37424328eb96cef5743d7f
 2015-03-02 20:44:16 +00:00
Nancy Chen
7c07dfa552 Add frameworks classes and methods necessary for VVM syncadapter structure. 
+ VvmSyncService is the base class for all visual voicemail sync
services that run the visual voicemail sync adapter. This class handles
writing to the voicemail provider and receiving changes from the
voicemail provider.
+ AuthenticatorService is a stub class for visual voicemail sync
adapters that do not use an Account (all sync adapters must have an
account associated with them, so a stub account is necessary).
+ Voicemail parcelable object to pass voicemail data around easier. This
is mostly copied from VoicemailProviderDemo
+ Extra helper methods in VoicemailContract to help insert and delete
from the voicemail provider.
+ Add multi-sim fields to VoicemailContract.Voicemails

Bug: 19236241
Change-Id: I603e3e5908704cd043e46221680d8bb600ed2cf4
 2015-03-02 20:43:58 +00:00
Santos Cordon
204f80e0aa Add PHONE_ACCOUNT_ADDRESS to the call log DB. 
Also update some javadoc comments.

Change-Id: If0f8fa0148b3aed74ed434b1017a279ce29b3842
 2015-03-02 20:43:26 +00:00
Santos Cordon
da35a2b477 Revert "Add PHONE_ACCOUNT_ADDRESS to the call log DB." 
This reverts commit 87bfb3576f6b76fa9838775e302ca0d74fc0071b.

Change-Id: I8e7056dbd3068b915fecff13128a45bb6e99c073
 2015-03-02 20:42:55 +00:00
Santos Cordon
40c6f2b429 Add PHONE_ACCOUNT_ADDRESS to the call log DB. 
Also update some javadoc comments.

Change-Id: I018dac4c92b00ecaf2f675623b924776e7698c55
 2015-03-02 20:42:13 +00:00
Ihab Awad
c4959abf5f Changed package name of a Telecom service 
Change-Id: Ib8d5b73a3cdb2aa353c586dccf423a8917a393d6
 2015-03-02 20:41:07 +00:00
Santos Cordon
b7bb8c4207 Small update to PhoneAccountHandle ID javadoc. 
Change-Id: I31832347689e1e9291cd6b9c100918668fa4b056
 2015-03-02 20:18:54 +00:00
Etan Cohen
4eddc11232 Merge "Add multi-SIM fields to VoicemailContract.Status." into m-wireless-dev 2015-03-02 20:18:34 +00:00
Etan Cohen
e28ad782b8 Merge "Add Sub-ID-from-phone-account converter method." into m-wireless-dev 2015-03-02 20:18:25 +00:00
Etan Cohen
bf443f9147 Merge "Unhide and rename PhoneNumberUtils tts methods" into m-wireless-dev 2015-03-02 20:18:16 +00:00
Etan Cohen
24ab1e4e91 Merge "Unhide telecom APIs needed by Contacts" into m-wireless-dev 2015-03-02 20:18:06 +00:00
Deepanshu Gupta
2b24d07a87 am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev 
* commit 'f2c1c09683a5cfa23e8394fe5a10e84803f4168b':
  Correct PorterDuff filters.
 2015-03-02 19:57:33 +00:00
Deepanshu Gupta
5e84b29233 am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev 
* commit '2022b0ffdd7c91e8435bc204ad9aedd658254166':
  Fix codestyle for switch statements.
 2015-03-02 19:57:29 +00:00
Deepanshu Gupta
ab027932d0 am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev 
* commit 'aff0ec93f2a734a68673f1f7337533b6d93cb256':
  Better error msg for StateList/Hexadecimal Color.
 2015-03-02 19:57:25 +00:00