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

152777 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vinit Deshpande
68c8ef8976 am 279e0cc4: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev 
* commit '279e0cc445625ca9c1aecbd3163cb6c63a671a31':
  Don't require CONNECTIVITY_INTERNAL check for protected broadcasts
 2014-09-11 18:25:11 +00:00
Vinit Deshpande
8a16eabfae Merge "Don't require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev 2014-09-11 18:16:39 +00:00
Amith Yamasani
0404113ec4 am 4fa40b32: Fix build 
* commit '4fa40b3233c9ae84c088aef7bc5913b810f13ed2':
  Fix build
 2014-09-11 18:08:58 +00:00
Amith Yamasani
26f9ea38a5 Fix build 
Import went missing between CLs

Change-Id: I8740b99dbce15b3f3508768ab3e02f551caf673d
 2014-09-11 10:56:51 -07:00
Svetoslav
e189de20b1 am dd18a7f7: Merge "Windows for accessibility with wrong coords on rotation." into lmp-dev 
* commit 'dd18a7f7c2e6b6a12c448b14b5f5260a07660f86':
  Windows for accessibility with wrong coords on rotation.
 2014-09-11 17:51:48 +00:00
Vineeta Srivastava
7c90b84ba4 am bc067325: Merge "Send empty flash for some CDMA carriers for 3way call" into lmp-dev 
* commit 'bc067325de8197a38feec3782a64e02023c9170d':
  Send empty flash for some CDMA carriers for 3way call
 2014-09-11 17:51:41 +00:00
Svetoslav
2f67e23738 Merge "Windows for accessibility with wrong coords on rotation." into lmp-dev 2014-09-11 17:42:44 +00:00
Vineeta Srivastava
e14a29ff3d Merge "Send empty flash for some CDMA carriers for 3way call" into lmp-dev 2014-09-11 17:41:02 +00:00
Matthew Williams
b82118fa1f am 3812a38b: Merge "Add flag to JobParameters for job expired" into lmp-dev 
* commit '3812a38b496e011166ca9e23620965eaace03bdc':
  Add flag to JobParameters for job expired
 2014-09-11 17:40:11 +00:00
Matthew Williams
91911fd952 Merge "Add flag to JobParameters for job expired" into lmp-dev 2014-09-11 17:27:58 +00:00
Tyler Gunn
714dbc5bd7 am ba740d4f: Allowing enable/disable of phone accounts. (1/3) 
* commit 'ba740d4f288c050687544491041af76140803d66':
  Allowing enable/disable of phone accounts. (1/3)
 2014-09-11 17:17:17 +00:00
Nancy Chen
26440158b9 am 48bc7ea4: Merge "API changes in GatewayInfo, Response, and PropertyPresentation (1/4)" into lmp-dev 
* commit '48bc7ea4953a04f6b308171243487fd31208ec11':
  API changes in GatewayInfo, Response, and PropertyPresentation (1/4)
 2014-09-11 17:17:12 +00:00
Tyler Gunn
a1ed7d1094 Allowing enable/disable of phone accounts. (1/3) 
- added "hasCapabilities" method on PhoneAccount.
- added CAPABILITY_PLACE_EMERGENCY_CALLS.
- added isEnabled method builder constructor to initialize from an
existing PhoneAccount.

Bug: 17306514
Bug: 17408536

Change-Id: I57de508b4adcf207f3b29cab449bfc634db80153
 2014-09-11 17:13:51 +00:00
Jon Larimer
d7b2f428d9 am 92d7b9a6: am 9d8da659: am d65ab587: am e2b12b1f: am 61c6ff7b: Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev 
* commit '92d7b9a6b7d15af9298ed72f7d443607923a5930':
  Fix issue #16794553: Duplicate ArrayMap entries in Bundle...
 2014-09-11 17:06:41 +00:00
Nancy Chen
4823aecef3 Merge "API changes in GatewayInfo, Response, and PropertyPresentation (1/4)" into lmp-dev 2014-09-11 17:06:28 +00:00
Jon Larimer
26a401987a am 9d8da659: am d65ab587: am e2b12b1f: am 61c6ff7b: Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev 
* commit '9d8da659ceb3989932e02b9342e5a6db06881030':
  Fix issue #16794553: Duplicate ArrayMap entries in Bundle...
 2014-09-11 16:54:33 +00:00
Amith Yamasani
d12c36d7b6 am 30a5e35b: Merge "Apply cross-user restrictions to Shell" into lmp-dev 
* commit '30a5e35bb2541f89f90b12d690085451c814a1dc':
  Apply cross-user restrictions to Shell
 2014-09-11 16:53:56 +00:00
Jing Zhao
ad6f28202a Send empty flash for some CDMA carriers for 3way call 
Some carrier need a empty flash before the normal one to connect the 3way call

Bug: 17331584
Change-Id: Ie8f774de909056e398972ea460029d903f059fec
 2014-09-11 09:49:45 -07:00
Amith Yamasani
f58e532e01 Merge "Apply cross-user restrictions to Shell" into lmp-dev 2014-09-11 16:46:34 +00:00
Jon Larimer
9d8da659ce am d65ab587: am e2b12b1f: am 61c6ff7b: Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev 
* commit 'd65ab587052934c42769b2d4cf8ec5fa70ef13f8':
  Fix issue #16794553: Duplicate ArrayMap entries in Bundle...
 2014-09-11 16:44:26 +00:00
ztenghui
987c7e0967 am 8738c8db: Merge "Bring back the fillAlpha and strokeAlpha." into lmp-dev 
* commit '8738c8db905dd7c471a06e0496040f46d7a48d5b':
  Bring back the fillAlpha and strokeAlpha.
 2014-09-11 16:44:17 +00:00
ztenghui
3b7191b8f0 am e1264a88: Merge "Re-triangulate the spot shadow." into lmp-dev 
* commit 'e1264a884e41d46828688edc226208e4dacaa047':
  Re-triangulate the spot shadow.
 2014-09-11 16:44:12 +00:00
Jon Larimer
d65ab58705 am e2b12b1f: am 61c6ff7b: Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev 
* commit 'e2b12b1fbc2880bf895fa2a9adcf65de3162c28f':
  Fix issue #16794553: Duplicate ArrayMap entries in Bundle...
 2014-09-11 16:33:07 +00:00
ztenghui
c96e392765 Merge "Bring back the fillAlpha and strokeAlpha." into lmp-dev 2014-09-11 16:32:37 +00:00
ztenghui
ca517b97e0 Merge "Re-triangulate the spot shadow." into lmp-dev 2014-09-11 16:32:05 +00:00
Jon Larimer
e2b12b1fbc am 61c6ff7b: Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev 
* commit '61c6ff7b70e2d42b44d5c5f9c3c8e3c67b584a76':
  Fix issue #16794553: Duplicate ArrayMap entries in Bundle...
 2014-09-11 16:23:39 +00:00
Jean-Michel Trivi
aaed97c369 am 8c57b9e9: Merge "More android.media.AudioFormat.Builder javadoc" into lmp-dev 
* commit '8c57b9e97676180a6da299165a2f6f445c84cfd4':
  More android.media.AudioFormat.Builder javadoc
 2014-09-11 16:22:21 +00:00
Alexandra Gherghina
fd913eca07 am e667e41b: Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev 
* commit 'e667e41bb60cbe5e6bde545ecaf1c7d9c8b36af1':
  Bugfix: use the correct user for ContentResolver calls
 2014-09-11 16:22:14 +00:00
Jean-Michel Trivi
698286847c Merge "More android.media.AudioFormat.Builder javadoc" into lmp-dev 2014-09-11 16:16:22 +00:00
Jon Larimer
61c6ff7b70 Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev 2014-09-11 16:15:25 +00:00
Alexandra Gherghina
ffb6343938 Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev 2014-09-11 16:12:59 +00:00
Przemyslaw Szczepaniak
7dddf9fc11 am b0a86a06: Merge "Replace TreeSet with HashSet." into lmp-dev 
* commit 'b0a86a068abf500f1ee2292cfac79af7f6830dfa':
  Replace TreeSet with HashSet.
 2014-09-11 16:06:16 +00:00
George Mount
70c2c0e7b1 am 1ca196bb: Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev 
* commit '1ca196bb7db9105b3ede380ce259a1c45b30a964':
  Omit appearing views that have a parent that is also appearing.
 2014-09-11 16:06:11 +00:00
Przemyslaw Szczepaniak
6931cc9f41 Merge "Replace TreeSet with HashSet." into lmp-dev 2014-09-11 15:59:36 +00:00
Przemyslaw Szczepaniak
3786bc5498 Replace TreeSet with HashSet. 
Both Locale and Voice do not implement Comparable.

Bug: 17467923
Change-Id: I683577e5b18ae1892e1ccea5ea241e1d016c9517
 2014-09-11 16:56:46 +01:00
George Mount
27d83aa9a8 Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev 2014-09-11 15:53:36 +00:00
Julia Reynolds
5da068b027 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 15:53:21 +00:00
Julia Reynolds
d86734b469 Merge "Allow device owners to update LOCATION_MODE." into lmp-dev 2014-09-11 15:46:07 +00:00
Yohei Yukawa
a0466b6ffb am 293e5007: Merge "Enrich test cases when enabling default IMEs part 3" into lmp-dev 
* commit '293e50073ab11b2cdb16aac5d9df561dc87bbdf5':
  Enrich test cases when enabling default IMEs part 3
 2014-09-11 15:38:52 +00:00
Baligh Uddin
5c9512e6e3 am 77522e51: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '77522e5137edb8ff175dd033ee80299cbd87bb38':
  Import translations. DO NOT MERGE
 2014-09-11 15:38:47 +00:00
Baligh Uddin
ee1d360bf8 am efef3133: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'efef31334deb579588009c9d8789c43a2324a992':
  Import translations. DO NOT MERGE
 2014-09-11 15:38:43 +00:00
Yohei Yukawa
e5fe4bc96d Merge "Enrich test cases when enabling default IMEs part 3" into lmp-dev 2014-09-11 15:32:16 +00:00
Baligh Uddin
ef9517f019 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-11 15:29:31 +00:00
Baligh Uddin
356a11a557 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-11 15:29:13 +00:00
Alexandra Gherghina
f44d8d72c1 am b04106ed: Merge "Remove package level intent forwarding." into lmp-dev 
* commit 'b04106ed46919030b944b02a8a227f8fe343c5a5':
  Remove package level intent forwarding.
 2014-09-11 15:24:44 +00:00
Alexandra Gherghina
02b6addb53 Merge "Remove package level intent forwarding." into lmp-dev 2014-09-11 15:17:21 +00:00
Yohei Yukawa
d77adfe52d Enrich test cases when enabling default IMEs part 3 
This is another groundwork for subsequent fixes.

Notable changes in test cases are:
- A dummy Hinglish IME ("en_US" + "hi") is added
- Added test cases where system locale is "en_GB",
  "en_IN", and "hi" as well as "en_US".

BUG: 17347871
Change-Id: Iacf0f47c4dbc147f8153df50ba58fc4da4dacd29
 2014-09-12 00:07:41 +09:00
Yohei Yukawa
1ce85f0693 am 163c3d9a: Merge "Enrich test cases when enabling default IMEs part 2" into lmp-dev 
* commit '163c3d9aa2e15c8e7d5415ce927362a7bc752d85':
  Enrich test cases when enabling default IMEs part 2
 2014-09-11 14:59:50 +00:00
Yohei Yukawa
91f49ed13c Merge "Enrich test cases when enabling default IMEs part 2" into lmp-dev 2014-09-11 14:50:01 +00:00
Yohei Yukawa
bca817b2e2 Enrich test cases when enabling default IMEs part 2 
This is another groundwork for subsequent fixes.

Notable changes in test cases are:
- isSystemReady == false is now coverted.
- tests can run even when the system locale of test
  environment is different from "en_US"

BUG: 17347871

Change-Id: I9434270735d3b37d8b788d41250b23d7950aaeed
 2014-09-11 23:44:43 +09:00