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

153011 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
f68b4d2b62 am 3fd1ada4: Merge "Disable layer leak tracking" into lmp-dev 
* commit '3fd1ada45051a03c2d15988d8f83d4f8531092d0':
  Disable layer leak tracking
 2014-09-12 18:52:51 +00:00
Marcin Kosiba
181ee69242 am 46683a27: Remove an @removed member of andorid.webkit.WebResourceResponse. 
* commit '46683a272ea5283a43d89a84bdab048994ca6a14':
  Remove an @removed member of andorid.webkit.WebResourceResponse.
 2014-09-12 18:52:47 +00:00
Cheuksan Wang
5e428e0443 am 59c04032: Merge "Send and download MMS via content provider instead of PDU bytes." into lmp-dev 
* commit '59c0403265a842ae47559b8b2055372a545edb61':
  Send and download MMS via content provider instead of PDU bytes.
 2014-09-12 18:52:42 +00:00
Christoph Studer
58d3f64ffc am ebdd94ba: Merge "NoMan: Refresh ManagedServices on user switch" into lmp-dev 
* commit 'ebdd94badbe08f262270f2b23c42514b35e284a7':
  NoMan: Refresh ManagedServices on user switch
 2014-09-12 18:52:35 +00:00
Sander Alewijnse
169ea171b8 am 4d9fe6d1: Merge "Rename email extra." into lmp-dev 
* commit '4d9fe6d15a4aa661eaea5b34a1810b4986732c4f':
  Rename email extra.
 2014-09-12 18:52:30 +00:00
Alexandra Gherghina
08324acd94 am 443a5766: Merge "Assign default icon to users at creation time and in SystemUI." into lmp-dev 
* commit '443a5766fa9b079c9612105cfe962d057fc98fe8':
  Assign default icon to users at creation time and in SystemUI.
 2014-09-12 18:52:25 +00:00
Yohei Yukawa
1e5ecbc7ec am 981f7904: Merge "Enrich test cases when enabling default IMEs part 4" into lmp-dev 
* commit '981f7904b07ae5029d661de74051cef9d09566cc':
  Enrich test cases when enabling default IMEs part 4
 2014-09-12 18:52:21 +00:00
George Mount
fc6114389e am 44673720: Merge "Fixed NPE in EnterTransitionCoordinator" into lmp-dev 
* commit '44673720ac0c4eb37f56f16d262cf5da68064fe2':
  Fixed NPE in EnterTransitionCoordinator
 2014-09-12 18:52:13 +00:00
Chris Wren
5343993e0c am c88b35aa: Merge "remove unused matchesCallFilter(Bundle, int)" into lmp-dev 
* commit 'c88b35aabaf2322721130e618667ba813c9b9fe4':
  remove unused matchesCallFilter(Bundle, int)
 2014-09-12 18:52:08 +00:00
Christoph Studer
7e1c84de62 am e31d13ea: Merge "Notification: Reset chronometer visibility" into lmp-dev 
* commit 'e31d13eab55c0c8e7b9eee93ed9d06e5328614eb':
  Notification: Reset chronometer visibility
 2014-09-12 18:52:03 +00:00
Adrian Roos
cea4fd05c8 am c6d7106f: Merge "Hide the increased window size due to colored bars from the view hierarchy" into lmp-dev 
* commit 'c6d7106f994dedce92e519f1551e03f430459f69':
  Hide the increased window size due to colored bars from the view hierarchy
 2014-09-12 18:51:57 +00:00
Kenny Guy
5e1c2570d8 am b5153aba: Hide APIs renamed during API review of LauncherApps 
* commit 'b5153aba264932068895228d3dde4e32a4ef271c':
  Hide APIs renamed during API review of LauncherApps
 2014-09-12 18:51:53 +00:00
Esteban Talavera
ff0d6ceecf am d23d7c60: Merge "Add new adb dpm (= DevicePolicyManager) command" into lmp-dev 
* commit 'd23d7c60f859a052c849452bdfccb9de44618610':
  Add new adb dpm (= DevicePolicyManager) command
 2014-09-12 18:51:47 +00:00
Zoltan Szatmary-Ban
9ac94ed2e9 am eb6ba38c: Merge "Leave SettingsProvider running if cloning of a setting fails" into lmp-dev 
* commit 'eb6ba38c90ca52133cd5c82bc9a3ee3c77c9fd4c':
  Leave SettingsProvider running if cloning of a setting fails
 2014-09-12 18:51:42 +00:00
Jessica Hummel
66c365f2e3 am a387dc16: Merge "Use correct string for provisioning complete action." into lmp-dev 
* commit 'a387dc16b436d9d76b247c8f623157acb6df88ad':
  Use correct string for provisioning complete action.
 2014-09-12 18:51:34 +00:00
Jinsuk Kim
72097d120e am de02cd6d: CEC: Stub MHL Device 
* commit 'de02cd6d02e0b6c5b0dac06a26cdade2109e8f23':
  CEC: Stub MHL Device
 2014-09-12 18:51:29 +00:00
Jinsuk Kim
9e6dd068ee am b524e3b0: CEC: Refactoring for MHL 
* commit 'b524e3b013cfb5b73bc672e41348705e15e9eaad':
  CEC: Refactoring for MHL
 2014-09-12 18:51:25 +00:00
Jinsuk Kim
8f59e04a75 am ead8ed86: CEC: Bug fixes for vendor-specific command handling 
* commit 'ead8ed86e8ec1bd1812e31ce5325ca263c5e04d4':
  CEC: Bug fixes for vendor-specific command handling
 2014-09-12 18:51:19 +00:00
Yuncheol Heo
4010810627 am ca46bfef: Merge "Handle <Menu Status> message." into lmp-dev 
* commit 'ca46bfefa37016989a3a8cfdf222594bbc778c96':
  Handle <Menu Status> message.
 2014-09-12 18:51:15 +00:00
Vineeta Srivastava
f8b9bf033a am d30cadc3: Merge changes I6559654c,Ia40480a4 into lmp-dev 
* commit 'd30cadc3e7e320cdadebabbdd387b514190da7c2':
  Delete IL Orange Dun type profile
  Add tethering apn for UK 3 operator
 2014-09-12 18:51:10 +00:00
Chris Craik
1aec711b2e Merge "Disable layer leak tracking" into lmp-dev 2014-09-12 17:41:13 +00:00
Marcin Kosiba
288e7de22e Remove an @removed member of andorid.webkit.WebResourceResponse. 
BUG: 17253647
Change-Id: I02f4f0600a09ceb3b68ba2698b80e413e7511663
 2014-09-12 18:24:49 +01:00
Cheuksan Wang
a6c52ac624 Merge "Send and download MMS via content provider instead of PDU bytes." into lmp-dev 2014-09-12 17:07:49 +00:00
Christoph Studer
820b70da02 Merge "NoMan: Refresh ManagedServices on user switch" into lmp-dev 2014-09-12 17:03:51 +00:00
Chris Craik
21029ef131 Disable layer leak tracking 
bug:17208461
Change-Id: Ibbdf3ec79c4fd19e1935a559d425d074b611e162
 2014-09-12 09:29:31 -07:00
Sander Alewijnse
098116854e Merge "Rename email extra." into lmp-dev 2014-09-12 16:14:30 +00:00
Alexandra Gherghina
3e7115ed02 Merge "Assign default icon to users at creation time and in SystemUI." into lmp-dev 2014-09-12 16:03:39 +00:00
Yohei Yukawa
12c12ee2bc Merge "Enrich test cases when enabling default IMEs part 4" into lmp-dev 2014-09-12 15:44:28 +00:00
Yohei Yukawa
59cccf93d2 Enrich test cases when enabling default IMEs part 4 
This is another groundwork for subsequent fixes.

Notable changes in test cases are:
- simplified test cases for voice IMEs.
- added more test cases for keyboard IMEs.
- introduced assertDefaultEnabledImes() to reduce code duplicate.

BUG: 17347871
Change-Id: I8cf61cfa18ac425a2cccc7823474c3f06dc0fa1e
 2014-09-13 00:29:49 +09:00
Alexandra Gherghina
64d4dca63f Assign default icon to users at creation time and in SystemUI. 
Right now different code in System UI, Settings app and other places replace the
user icon with their own default. This tries to make it consistent by moving the
mechanism used in Settings in a helper class.

Bug: 17311038
Change-Id: Ic858c65bf82a98b9806dbba029e7cdcf441f372e
 2014-09-12 15:43:42 +01:00
George Mount
2418d7381f Merge "Fixed NPE in EnterTransitionCoordinator" into lmp-dev 2014-09-12 14:09:23 +00:00
Chris Wren
135ce76a26 Merge "remove unused matchesCallFilter(Bundle, int)" into lmp-dev 2014-09-12 14:04:33 +00:00
Christoph Studer
c30afd1e74 Merge "Notification: Reset chronometer visibility" into lmp-dev 2014-09-12 13:57:37 +00:00
Christoph Studer
b53dfd4fae NoMan: Refresh ManagedServices on user switch 
Fix a bug where ManagedServices didn't unbind from obsolete and
bind to new services after switching the current user.

Bug: 17477093
Change-Id: Ica28978a01f84ba17bdd93e2feaf68547e837bcc
 2014-09-12 15:38:56 +02:00
Adrian Roos
91db5ea149 Merge "Hide the increased window size due to colored bars from the view hierarchy" into lmp-dev 2014-09-12 13:28:18 +00:00
Kenny Guy
b6edee0dad Hide APIs renamed during API review of LauncherApps 
Bug: 17390765
Change-Id: I79a979365005b13a2268b1cfe455241ae4fecb51
 2014-09-12 11:44:58 +00:00
Sander Alewijnse
2b338a27be Rename email extra. 
Bug:17389863
Change-Id: Ie001d71e92e212b83882529ed7c93303b64277c6
 2014-09-12 12:28:40 +01:00
Esteban Talavera
d09fbafa92 Merge "Add new adb dpm (= DevicePolicyManager) command" into lmp-dev 2014-09-12 10:35:44 +00:00
Esteban Talavera
b5ef162129 Add new adb dpm (= DevicePolicyManager) command 
Adds new adb command to execute DevicePolicyManager tasks. First subcommand
allows us to set a device owner on a provisioned device (provided no accounts
are associated with the device). This is required as GTS tests run on provisioned
devices. We plan to add more subcomands required for new GTS tests, such as the
ability to create a managed profile.

Bug: 17312478, 17316711
Change-Id: I2613178ea82a6c6268e7f8012e74c4a852fea0d4
 2014-09-12 11:33:59 +01:00
Zoltan Szatmary-Ban
11f72c0d97 Merge "Leave SettingsProvider running if cloning of a setting fails" into lmp-dev 2014-09-12 10:15:10 +00:00
Jessica Hummel
d4aaab99bb Merge "Use correct string for provisioning complete action." into lmp-dev 2014-09-12 10:02:47 +00:00
Jessica Hummel
5669216e0d Use correct string for provisioning complete action. 
Change-Id: If7e0ca78a89f2cf4853ce01eb14e8a2913e3f85d
bug: 17390600
 2014-09-12 09:27:30 +00:00
Jinsuk Kim
3b9309a01c CEC: Stub MHL Device 
Replaced HdmiMhlLocalDevice with stub implementation,
and removed other MHL classes.

Bug: 17479050

Change-Id: I08880b0703eb4a94ae5e8aa973886a15f8160a38
 2014-09-12 17:30:32 +09:00
Jinsuk Kim
a94417a516 CEC: Refactoring for MHL 
This helps MHL code clean-up.

- Factored MHL constants out to a new class
- Renamed some methods

Bug: 17479050
Change-Id: Ia39f8bb51ce552ac10f587e6ee0431951f2f494b
 2014-09-12 17:25:58 +09:00
Jinsuk Kim
d4a94db1cd CEC: Bug fixes for vendor-specific command handling 
- Add sendStandby()
- Respond with <Feature Abort>[INCORRECT_MODE] when the listener
  is not ready

Bug: 17379243
Bug: 17358887
Change-Id: I26a4157a70f11206978763fbbe69e4190e3e1d5c
 2014-09-12 16:22:23 +09:00
Yuncheol Heo
753fcc8a8a Merge "Handle <Menu Status> message." into lmp-dev 2014-09-12 07:17:32 +00:00
Vineeta Srivastava
a871d7e003 Merge changes I6559654c,Ia40480a4 into lmp-dev 
* changes:
  Delete IL Orange Dun type profile
  Add tethering apn for UK 3 operator
 2014-09-12 07:10:18 +00:00
seonju.oh
45c6e065e4 Delete IL Orange Dun type profile 
Bug:12180714

Change-Id: I6559654cce8c95fdea06c3b0da1730c3c467c96b
 2014-09-11 23:36:53 -07:00
Yuncheol Heo
61e1abb918 am d9ff6887: Merge "Respond <Feature Abort: Invaild operand> for the invaild messages." into lmp-dev 
* commit 'd9ff68875b0f09baccc1102ad4bc658439d2a7cd':
  Respond <Feature Abort: Invaild operand> for the invaild messages.
 2014-09-12 06:34:48 +00:00
Yuncheol Heo
29b3e79dc3 Merge "Respond <Feature Abort: Invaild operand> for the invaild messages." into lmp-dev 2014-09-12 06:27:37 +00:00