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

124941 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sailesh Nepal
2cde710fe4 Update TelephonyManager.WifiCallingChoices API 
This CL updates the order of the WifiCallingChoices values
to match the wifi_calling_choice_values resource.

Change-Id: Iaa643d7a70938877c760ff4a65f737a4c1c750da
 2014-02-11 22:54:58 -08:00
Sailesh Nepal
bdd484f6f2 Add abstract base implementation of CallService. 
Base implementation takes care of a lot of boilerplate code.

Change-Id: Iaf5a16f5718727cee0f7efb4af53a021536f50d8
 2014-02-11 22:52:16 -08:00
Sailesh Nepal
eaeb071a17 Add interface definitions for CallService/PhoneService 
Interfaces are meant to replace ThirdParty*.aidl/java files in same
directory long term.  The differences in methods are on purpose and
reflect more recent design directions.

Change-Id: Ia98603a1d0b6d07a3393c5f7c5aa040f9e3916e4
 2014-02-11 22:36:26 -08:00
Sailesh Nepal
1bd7876d76 Add Wi-Fi calling state setting to telephony interfaces 
Change-Id: I01029ade0eb1ff981cb92a536d042a02129a053f
 2014-02-11 22:32:21 -08:00
Sailesh Nepal
512b28309d DO NOT MERGE ThirdPartyCallSendDtmfCallBack API 
This API is needed to implement post dial.

Change-Id: Iefdeae81d0eae6be86e7ee1e8ab0251ae43ed079
 2014-02-11 22:22:42 -08:00
Sailesh Nepal
960fe9a5ff ThirdPartyPhone: DTMF & callerDisplayName API DO NOT MERGE 
This CL extends the ThirdPartyCall API to support DTMF and
callerDisplayname.

Change-Id: Ia3b4730e852a95d0c11fbddfbe1b780aec39dbb5
 2014-02-11 22:18:35 -08:00
Sailesh Nepal
aae9216320 Add new phone type (public API) DO NOT MERGE 
This CL adds a new public API to allow services to implement calls.

Change-Id: I4d30eb4d91bd342506cad4ced059bd8446c2bec4
 2014-02-11 22:08:33 -08:00
Sailesh Nepal
d97a033ddc Merge "Revert "Add new phone type (public API) DO NOT MERGE"" into master-nova 2014-02-12 06:04:05 +00:00
Sailesh Nepal
b47ed4f44a Revert "Add new phone type (public API) DO NOT MERGE" 
This reverts commit 0590ac70a93c713c6cf28c3bcbce287d9864f037.

Change-Id: I1f4b34c0f8246bb601e2ba5f14eabe9c36d33d94
 2014-02-12 06:02:26 +00:00
Sailesh Nepal
558c6e719c Merge "Add new phone type (public API) DO NOT MERGE" into master-nova 2014-02-12 05:34:21 +00:00
Sailesh Nepal
0590ac70a9 Add new phone type (public API) DO NOT MERGE 
This CL adds a new public API to allow services to implement calls.

Change-Id: If6fef93aebc8b199880ad44d35b7d8ae69f71f9e
 2014-02-11 21:27:13 -08:00
Ken Wakasa
3af5efae45 am 55f79f50: Fix typo in comments for supportsSwitchingToNextInputMethod 
* commit '55f79f509f2aba413e90706b127c243836105a28':
  Fix typo in comments for supportsSwitchingToNextInputMethod
 2014-02-11 20:11:17 -08:00
Ken Wakasa
55f79f509f Fix typo in comments for supportsSwitchingToNextInputMethod 
Change-Id: I387acd8ce3125c0d35e43757de7166a284da630b
 2014-02-12 12:54:58 +09:00
Scott Main
458f51a508 am 4b1c5569: am 7ef544f0: am dac4429f: am 08d28f59: am 6d1d2134: am 11bb34da: am 9854f69f: Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs 
* commit '4b1c556965eb9f694478a0011f11a0a981166396':
  add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
 2014-02-11 17:32:10 -08:00
Scott Main
4b1c556965 am 7ef544f0: am dac4429f: am 08d28f59: am 6d1d2134: am 11bb34da: am 9854f69f: Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs 
* commit '7ef544f07f3bb78d3a49c5cd60ad667964cedd57':
  add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
 2014-02-12 01:30:04 +00:00
Scott Main
7ef544f07f am dac4429f: am 08d28f59: am 6d1d2134: am 11bb34da: am 9854f69f: Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs 
* commit 'dac4429f21caffea61b626797afd142db5025e42':
  add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
 2014-02-12 01:26:35 +00:00
Scott Main
dac4429f21 am 08d28f59: am 6d1d2134: am 11bb34da: am 9854f69f: Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs 
* commit '08d28f59bd74ab4109cf5343ef056a8d4b796ef6':
  add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
 2014-02-12 01:24:02 +00:00
Scott Main
08d28f59bd am 6d1d2134: am 11bb34da: am 9854f69f: Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs 
* commit '6d1d21340fe6ca84fdef76dd6f9ba7c315b7a73e':
  add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
 2014-02-12 01:18:48 +00:00
Scott Main
6d1d21340f am 11bb34da: am 9854f69f: Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs 
* commit '11bb34da5f68f70f3350199e3578445d9a1eaae3':
  add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
 2014-02-12 01:15:25 +00:00
Scott Main
11bb34da5f am 9854f69f: Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs 
* commit '9854f69f75352e473e34410b0b298b7c7f04434a':
  add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
 2014-02-12 01:12:08 +00:00
Scott Main
9854f69f75 Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page" into klp-docs 2014-02-12 01:09:21 +00:00
Jeff Brown
b94ebf0dee am 1717eb1d: am a872c22a: (-s ours) am be83e4a0: am 38f96e50: Add support for injecting events into ActivityContainers. (DO NOT MERGE) 
* commit '1717eb1dc16402627d3361f8bb78493ba0beb9f0':
  Add support for injecting events into ActivityContainers. (DO NOT MERGE)
 2014-02-11 16:47:02 -08:00
Jeff Brown
1717eb1dc1 am a872c22a: (-s ours) am be83e4a0: am 38f96e50: Add support for injecting events into ActivityContainers. (DO NOT MERGE) 
* commit 'a872c22aa4b252c55a4fccfb0f2ec501278179ad':
  Add support for injecting events into ActivityContainers. (DO NOT MERGE)
 2014-02-12 00:45:00 +00:00
Jeff Brown
a872c22aa4 am be83e4a0: am 38f96e50: Add support for injecting events into ActivityContainers. (DO NOT MERGE) 
* commit 'be83e4a08e909b773ffc06a6e59446deadb8af8b':
  Add support for injecting events into ActivityContainers. (DO NOT MERGE)
 2014-02-12 00:41:49 +00:00
Jeff Brown
68b01acdec am 47b32a0b: Merge "Add support for injecting events into ActivityContainers." 
* commit '47b32a0be1068c40cedc7ffbb93636f39556feef':
  Add support for injecting events into ActivityContainers.
 2014-02-11 16:38:33 -08:00
Jeff Brown
be83e4a08e am 38f96e50: Add support for injecting events into ActivityContainers. (DO NOT MERGE) 
* commit '38f96e5020b3e82b98fe97b0be363a5ad185860f':
  Add support for injecting events into ActivityContainers. (DO NOT MERGE)
 2014-02-12 00:37:24 +00:00
Jeff Brown
47b32a0be1 Merge "Add support for injecting events into ActivityContainers." 2014-02-12 00:35:08 +00:00
Qiwen Zhao
9615cca99b reset to master at 340312e with history 2014-02-11 15:03:02 -08:00
Dianne Hackborn
340312efac am d9e385b1: Fix build. 
* commit 'd9e385b111ebf811beb0f29178a2fbd4d667509f':
  Fix build.
 2014-02-11 22:58:16 +00:00
Jeff Brown
ca9bc702df Add support for injecting events into ActivityContainers. 
Modified ActivityView to inject touch events it receives back into
its activity container.  The container then injects the event into
the input system along with the display id of the underlying virtual
display.

Change-Id: I23d018a2f7dd30f1f833f522eb7f143b43d8e637
 2014-02-11 14:47:48 -08:00
Dianne Hackborn
d9e385b111 Fix build. 
At least part of what is broken.  Other stuff still seems to be.

Change-Id: I367dc0377bd5b4e59d9d9b68f3506bf1d64aa591
(cherry picked from commit 32bb5fae353b5bb6275e75952e89c514c7369cee)
 2014-02-11 22:47:42 +00:00
Jeff Brown
38f96e5020 Add support for injecting events into ActivityContainers. (DO NOT MERGE) 
Modified ActivityView to inject touch events it receives back into
its activity container.  The container then injects the event into
the input system along with the display id of the underlying virtual
display.

Enhanced the input system to support concurrent dispatch of touch
events on multiple displays which is required for this to work.

Change-Id: I9cf1870db3be6f99a52ed9a1e3ceafe42c940093
 2014-02-11 14:43:04 -08:00
Jean-Michel Trivi
ed8bb0159c Merge "AudioTrack JNI function rename" 2014-02-11 22:38:27 +00:00
Dianne Hackborn
32bb5fae35 Fix build. 
At least part of what is broken.  Other stuff still seems to be.

Change-Id: I367dc0377bd5b4e59d9d9b68f3506bf1d64aa591
 2014-02-11 14:22:14 -08:00
Griff Hazen
6adfd86ca9 am 4e795ebe: am 0ff811db: Merge "Add local-only option to Notification (using flag)" into klp-modular-dev 
* commit '4e795ebe1783623a28a988f77b4f0f11d54e73be':
  Add local-only option to Notification (using flag)
 2014-02-11 21:40:48 +00:00
Griff Hazen
4e795ebe17 am 0ff811db: Merge "Add local-only option to Notification (using flag)" into klp-modular-dev 
* commit '0ff811db58089e7b4e8fbca4f41be8f20c86ce10':
  Add local-only option to Notification (using flag)
 2014-02-11 21:34:53 +00:00
Griff Hazen
0ff811db58 Merge "Add local-only option to Notification (using flag)" into klp-modular-dev 2014-02-11 21:26:53 +00:00
Jeff Sharkey
7b0e282715 Merge "First <provider> always wins." 2014-02-11 21:25:46 +00:00
Baligh Uddin
2e1ff903b8 Merge "Import translations. DO NOT MERGE" 2014-02-11 21:17:39 +00:00
Baligh Uddin
b444149134 Merge "Import translations. DO NOT MERGE" 2014-02-11 21:17:34 +00:00
Baligh Uddin
5e0a6f5264 Merge "Import translations. DO NOT MERGE" 2014-02-11 21:17:17 +00:00
Dianne Hackborn
47b80be208 am be49403a: am 0cd115e1: am 578087e3: Merge "New command line tool \'idmap\'" 
* commit 'be49403a0362c18edaeafe59ac09baac14294dee':
  New command line tool 'idmap'
 2014-02-11 20:44:38 +00:00
Dianne Hackborn
be49403a03 am 0cd115e1: am 578087e3: Merge "New command line tool \'idmap\'" 
* commit '0cd115e1cebf4c090e7c36a65d4a5b7d1c363c21':
  New command line tool 'idmap'
 2014-02-11 20:35:50 +00:00
Katie McCormick
43750f19e7 am b8645efb: am caec59c1: am d2e6c89a: am 0a96a82b: am 0cb2c76b: Merge "Doc update: clarify best practices." into klp-docs 
* commit 'b8645efbc8b7f57168d1f5108b65e5bea576b1d1':
  Doc update: clarify best practices.
 2014-02-11 20:35:01 +00:00
Dianne Hackborn
0cd115e1ce am 578087e3: Merge "New command line tool \'idmap\'" 
* commit '578087e39845a0c9a728ba18963f498d1f69b279':
  New command line tool 'idmap'
 2014-02-11 12:32:17 -08:00
Dianne Hackborn
578087e398 Merge "New command line tool 'idmap'" 2014-02-11 20:30:08 +00:00
Katie McCormick
b8645efbc8 am caec59c1: am d2e6c89a: am 0a96a82b: am 0cb2c76b: Merge "Doc update: clarify best practices." into klp-docs 
* commit 'caec59c176444c87fe6fdd58edc1bbc61242eebb':
  Doc update: clarify best practices.
 2014-02-11 20:27:33 +00:00
Katie McCormick
caec59c176 am d2e6c89a: am 0a96a82b: am 0cb2c76b: Merge "Doc update: clarify best practices." into klp-docs 
* commit 'd2e6c89a24b9049c490c551ac49ecc75570fc50e':
  Doc update: clarify best practices.
 2014-02-11 20:23:58 +00:00
Jeff Sharkey
c6809bb685 First <provider> always wins. 
In scanPackageLI(), the first provider to claim an authority wins
over any other later providers.  To match this behavior, this changes
ProviderIntentResolver to ignore later providers with the same
ComponentName.

Without this behavior, AM.getContentProvider() could end up wedged
waiting for a provider that generateApplicationProvidersLocked()
never decided to spin up.

Bug: 12956224
Change-Id: I37d3e6e9cf3eea2cac4c0e914134f6c83b2fc2bf
 2014-02-11 12:22:15 -08:00
Katie McCormick
d2e6c89a24 am 0a96a82b: am 0cb2c76b: Merge "Doc update: clarify best practices." into klp-docs 
* commit '0a96a82bbe153ed2337b67435016d35eb434da16':
  Doc update: clarify best practices.
 2014-02-11 20:22:00 +00:00