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

184845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vinit Deshpande
f17e886554 am "am 4eedcceb: Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev" 
merged from goog/mirror-m-wireless-internal-release
3797ee9 am 4eedcceb: Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev
 2015-03-15 13:42:40 -07:00
Vinit Deshpande
fd67bf63e6 am "add 2 side RTT support on scan" 
merged from goog/mirror-m-wireless-internal-release
6e58424 add 2 side RTT support on scan
 2015-03-15 13:42:38 -07:00
Vinit Deshpande
503bdb519e am "am c974ac11: MediaProjectionPermissionActivity: Fix NPE. automerge: d3c532e" 
merged from goog/mirror-m-wireless-internal-release
73cb967 am c974ac11: MediaProjectionPermissionActivity: Fix NPE. automerge: d3c532e
 2015-03-15 13:42:37 -07:00
Vinit Deshpande
0772daa362 am "am c974ac11: MediaProjectionPermissionActivity: Fix NPE." 
merged from goog/mirror-m-wireless-internal-release
d3c532e am c974ac11: MediaProjectionPermissionActivity: Fix NPE.
 2015-03-15 13:42:36 -07:00
Vinit Deshpande
0f8fb7a02b am "am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs automerge: 9a447bc" 
merged from goog/mirror-m-wireless-internal-release
2782f31 am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs automerge: 9a447bc
 2015-03-15 13:42:35 -07:00
Vinit Deshpande
c0aa1019af am "am a81ed3cd: docs: support library updates for sdk 22 automerge: 7a3dc08" 
merged from goog/mirror-m-wireless-internal-release
2444690 am a81ed3cd: docs: support library updates for sdk 22 automerge: 7a3dc08
 2015-03-15 13:42:34 -07:00
Vinit Deshpande
2334a447e8 am "am e0ce0f2c: docs: platform revisions 5.1 automerge: 7de9d3b" 
merged from goog/mirror-m-wireless-internal-release
c3b5768 am e0ce0f2c: docs: platform revisions 5.1 automerge: 7de9d3b
 2015-03-15 13:42:33 -07:00
Vinit Deshpande
41372bbe81 am "am 54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev automerge: a5587b9" 
merged from goog/mirror-m-wireless-internal-release
63751cf am 54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev automerge: a5587b9
 2015-03-15 13:42:32 -07:00
Vinit Deshpande
ee1ef0ad14 am "am 2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev automerge: 0a1d5ca" 
merged from goog/mirror-m-wireless-internal-release
91572ab am 2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev automerge: 0a1d5ca
 2015-03-15 13:42:31 -07:00
Vinit Deshpande
9470f17ebb am "am 3f3f842c: am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs automerge: b068c14" 
merged from goog/mirror-m-wireless-internal-release
0764a8b am 3f3f842c: am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs automerge: b068c14
 2015-03-15 13:42:30 -07:00
Vinit Deshpande
b7899e477b am "am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev automerge: 287f257" 
merged from goog/mirror-m-wireless-internal-release
6e3276c am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev automerge: 287f257
 2015-03-15 13:42:29 -07:00
Vinit Deshpande
756d0ccced am "am 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev automerge: 622c011" 
merged from goog/mirror-m-wireless-internal-release
46d48f9 am 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev automerge: 622c011
 2015-03-15 13:42:28 -07:00
Vinit Deshpande
a9fb18f2d4 am "am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs" 
merged from goog/mirror-m-wireless-internal-release
9a447bc am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
 2015-03-15 13:42:27 -07:00
Vinit Deshpande
7cffc01b5d am "am a81ed3cd: docs: support library updates for sdk 22" 
merged from goog/mirror-m-wireless-internal-release
7a3dc08 am a81ed3cd: docs: support library updates for sdk 22
 2015-03-15 13:42:25 -07:00
Vinit Deshpande
5aeadfe5e6 am "am e0ce0f2c: docs: platform revisions 5.1" 
merged from goog/mirror-m-wireless-internal-release
7de9d3b am e0ce0f2c: docs: platform revisions 5.1
 2015-03-15 13:42:24 -07:00
Vinit Deshpande
f50b65169b am "am 54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev" 
merged from goog/mirror-m-wireless-internal-release
a5587b9 am 54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev
 2015-03-15 13:42:23 -07:00
Vinit Deshpande
1df3012544 am "am 2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev" 
merged from goog/mirror-m-wireless-internal-release
0a1d5ca am 2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev
 2015-03-15 13:42:22 -07:00
Vinit Deshpande
22d12c8d24 am "am 3f3f842c: am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs" 
merged from goog/mirror-m-wireless-internal-release
b068c14 am 3f3f842c: am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs
 2015-03-15 13:42:21 -07:00
Vinit Deshpande
024e535b62 am "am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev" 
merged from goog/mirror-m-wireless-internal-release
287f257 am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev
 2015-03-15 13:42:20 -07:00
Vinit Deshpande
01844e41a9 am "am 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev" 
merged from goog/mirror-m-wireless-internal-release
622c011 am 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev
 2015-03-15 13:42:19 -07:00
Vinit Deshpande
a0cf891c91 am "Correct "Sign-in" and "Sign into" to "Sign in to"." 
merged from goog/mirror-m-wireless-internal-release
44f7239 Correct "Sign-in" and "Sign into" to "Sign in to".
 2015-03-15 13:42:17 -07:00
Vinit Deshpande
8bc9859c85 am "Merge "Refactor NetworkUtils interaction with DHCP." into m-wireless-dev" 
merged from goog/mirror-m-wireless-internal-release
46bdfa9 Merge "Refactor NetworkUtils interaction with DHCP." into m-wireless-dev
 2015-03-15 13:42:16 -07:00
Vinit Deshpande
2ac988f4b4 am "am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev automerge: 4322c8d" 
merged from goog/mirror-m-wireless-internal-release
335b59f am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev automerge: 4322c8d
 2015-03-15 13:42:15 -07:00
Vinit Deshpande
8bc1772ed9 am "am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev" 
merged from goog/mirror-m-wireless-internal-release
4322c8d am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev
 2015-03-15 13:42:14 -07:00
Vinit Deshpande
c33c889a01 am "am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev automerge: 2b24d07" 
merged from goog/mirror-m-wireless-internal-release
969b027 am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev automerge: 2b24d07
 2015-03-15 13:42:13 -07:00
Vinit Deshpande
73ef68bacb am "am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev automerge: 5e84b29" 
merged from goog/mirror-m-wireless-internal-release
e99bef0 am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev automerge: 5e84b29
 2015-03-15 13:42:12 -07:00
Vinit Deshpande
f764cb21de am "am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev automerge: ab02793" 
merged from goog/mirror-m-wireless-internal-release
b2c8848 am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev automerge: ab02793
 2015-03-15 13:42:11 -07:00
Vinit Deshpande
f38deb644a am "Update API." 
merged from goog/mirror-m-wireless-internal-release
3ec7681 Update API.

Change-Id: Id4a08ee8e55cd4f5e8182a38d4855be80d452090
 2015-03-15 13:42:02 -07:00
Vinit Deshpande
7b3f6a95a8 am "Add frameworks classes and methods necessary for VVM syncadapter structure." 
merged from goog/mirror-m-wireless-internal-release
7c07dfa Add frameworks classes and methods necessary for VVM syncadapter structure.
 2015-03-15 13:41:31 -07:00
Vinit Deshpande
3b444db1d6 am "Add PHONE_ACCOUNT_ADDRESS to the call log DB." 
merged from goog/mirror-m-wireless-internal-release
204f80e Add PHONE_ACCOUNT_ADDRESS to the call log DB.

Change-Id: I363403bf73b202f03b3f706a823b0f142183a695
 2015-03-15 13:41:25 -07:00
Vinit Deshpande
aae695b50d am "Revert "Add PHONE_ACCOUNT_ADDRESS to the call log DB."" 
merged from goog/mirror-m-wireless-internal-release
da35a2b Revert "Add PHONE_ACCOUNT_ADDRESS to the call log DB."

Change-Id: I4dc4865d58e4b68858c7767f201e267a72dc236b
 2015-03-15 13:41:14 -07:00
Vinit Deshpande
4447a5e2c7 am "Add PHONE_ACCOUNT_ADDRESS to the call log DB." 
merged from goog/mirror-m-wireless-internal-release
40c6f2b Add PHONE_ACCOUNT_ADDRESS to the call log DB.

Change-Id: I91b487137a2da621b496bf5f135fe19bb0a6ca62
 2015-03-15 13:41:04 -07:00
Vinit Deshpande
a891039eec am "Changed package name of a Telecom service" 
merged from goog/mirror-m-wireless-internal-release
c4959ab Changed package name of a Telecom service
 2015-03-15 13:40:57 -07:00
Vinit Deshpande
913cf60784 am "Small update to PhoneAccountHandle ID javadoc." 
merged from goog/mirror-m-wireless-internal-release
b7bb8c4 Small update to PhoneAccountHandle ID javadoc.
 2015-03-15 13:40:55 -07:00
Vinit Deshpande
50115748c2 am "Merge "Add multi-SIM fields to VoicemailContract.Status." into m-wireless-dev" 
merged from goog/mirror-m-wireless-internal-release
4eddc11 Merge "Add multi-SIM fields to VoicemailContract.Status." into m-wireless-dev
 2015-03-15 13:40:54 -07:00
Vinit Deshpande
ab7240f241 am "Merge "Add Sub-ID-from-phone-account converter method." into m-wireless-dev" 
merged from goog/mirror-m-wireless-internal-release
e28ad78 Merge "Add Sub-ID-from-phone-account converter method." into m-wireless-dev
 2015-03-15 13:40:53 -07:00
Vinit Deshpande
232a0c32b9 am "Merge "Unhide and rename PhoneNumberUtils tts methods" into m-wireless-dev" 
merged from goog/mirror-m-wireless-internal-release
bf443f9 Merge "Unhide and rename PhoneNumberUtils tts methods" into m-wireless-dev
 2015-03-15 13:40:52 -07:00
Vinit Deshpande
c1d4763299 am "Merge "Unhide telecom APIs needed by Contacts" into m-wireless-dev" 
merged from goog/mirror-m-wireless-internal-release
24ab1e4 Merge "Unhide telecom APIs needed by Contacts" into m-wireless-dev
 2015-03-15 13:40:51 -07:00
Vinit Deshpande
a15fab5cb1 am "am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev" 
merged from goog/mirror-m-wireless-internal-release
2b24d07 am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev
 2015-03-15 13:40:50 -07:00
Vinit Deshpande
b471ae2ef4 am "am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev" 
merged from goog/mirror-m-wireless-internal-release
5e84b29 am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev
 2015-03-15 13:40:49 -07:00
Vinit Deshpande
e9b4887ddc am "am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev" 
merged from goog/mirror-m-wireless-internal-release
ab02793 am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev
 2015-03-15 13:40:48 -07:00
Vinit Deshpande
2dbfda720d am "am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev" 
merged from goog/mirror-m-wireless-internal-release
c92fa1f am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev
 2015-03-15 13:40:47 -07:00
Vinit Deshpande
79baf378d2 am "Add multi-SIM fields to VoicemailContract.Status." 
merged from goog/mirror-m-wireless-internal-release
109dabd Add multi-SIM fields to VoicemailContract.Status.
 2015-03-15 13:40:45 -07:00
Vinit Deshpande
df5e2e14fd am "Add Sub-ID-from-phone-account converter method." 
merged from goog/mirror-m-wireless-internal-release
9b09c15 Add Sub-ID-from-phone-account converter method.
 2015-03-15 13:40:43 -07:00
Vinit Deshpande
c8b86db5c2 am "am 8243b74f: am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update" 
merged from goog/mirror-m-wireless-internal-release
d186768 am 8243b74f: am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update
 2015-03-15 13:40:42 -07:00
Vinit Deshpande
2219195d7a am "Unhide and rename PhoneNumberUtils tts methods" 
merged from goog/mirror-m-wireless-internal-release
57f8f0d Unhide and rename PhoneNumberUtils tts methods

Change-Id: I72ddd3c38b69a7354564e5d1a1ae2d20330f6f2b
 2015-03-15 13:40:36 -07:00
Vinit Deshpande
8284f80358 am "Unhide telecom APIs needed by Contacts" 
merged from goog/mirror-m-wireless-internal-release
48d8442 Unhide telecom APIs needed by Contacts
 2015-03-15 13:40:28 -07:00
Vinit Deshpande
e94d762182 am "Refactor NetworkUtils interaction with DHCP." 
merged from goog/mirror-m-wireless-internal-release
3c3ce17 Refactor NetworkUtils interaction with DHCP.
 2015-03-15 13:40:27 -07:00
Vinit Deshpande
5d95956c54 am "am 37f207e1: am 191131d4: am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs" 
merged from goog/mirror-m-wireless-internal-release
500a98a am 37f207e1: am 191131d4: am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs
 2015-03-15 13:40:26 -07:00
Vinit Deshpande
bf082c05aa am "am dedba01a: am d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs" 
merged from goog/mirror-m-wireless-internal-release
9036eeb am dedba01a: am d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs
 2015-03-15 13:40:24 -07:00