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

21577 Commits

Author SHA1 Message Date
Wonsik Kim
f47b7c42cb am 2c3f6616: am 5b820a8a: Fix build 
* commit '2c3f661678e0f047033b4e78ee74f643e1a1fcc4':
  Fix build
 2014-10-27 03:00:10 +00:00
Wonsik Kim
5b820a8aa1 Fix build 
Bug: 17648994
Change-Id: I35e1c89c707c4e9809cc3e4b6cf5b57dae898ba0
 2014-10-27 11:02:10 +09:00
Wonsik Kim
bae8d7e64a am 03bdbca2: am 470b77b8: Merge "TIF: change input state based on the number of available streams" into lmp-mr1-dev 
* commit '03bdbca2a9582691063585ce5fca11e6a33bdfaf':
  TIF: change input state based on the number of available streams
 2014-10-27 02:01:13 +00:00
Wonsik Kim
470b77b8cf Merge "TIF: change input state based on the number of available streams" into lmp-mr1-dev 2014-10-27 00:59:44 +00:00
Paul Lawrence
60302f1938 am c220d8e5: Stop crypto UI from crashing during encryption automerge: 0e6178b automerge: e20dd30 
automerge: 31deee5

* commit '31deee5e307c00245d0fc7fd09dfe299145e1e0c':
  Stop crypto UI from crashing during encryption
 2014-10-24 21:30:13 +00:00
Paul Lawrence
e20dd304b7 am c220d8e5: Stop crypto UI from crashing during encryption 
automerge: 0e6178b

* commit '0e6178b81eb5a09253acbb6e28ee863ffbf8a5a5':
  Stop crypto UI from crashing during encryption
 2014-10-24 20:56:22 +00:00
Paul Lawrence
0e6178b81e am c220d8e5: Stop crypto UI from crashing during encryption 
* commit 'c220d8e57ca97c70db1fd72f040bd6c6f70bbf13':
  Stop crypto UI from crashing during encryption
 2014-10-24 20:08:33 +00:00
Paul Lawrence
c220d8e57c Stop crypto UI from crashing during encryption 
Don't try to read crypto meta data during this time

Bug: 18037893
Change-Id: I3628572b3b90e6fc0a7c71089b447fb0e5303ee9
 2014-10-24 10:37:40 -07:00
Jason Monk
b22d1002d1 am 730409c3: am 013d14f8: Merge "Make lock task check if focused better" into lmp-mr1-dev 
* commit '730409c332e19c34f7c309fbe054532eec88bdbc':
  Make lock task check if focused better
 2014-10-24 15:20:55 +00:00
Jason Monk
013d14f887 Merge "Make lock task check if focused better" into lmp-mr1-dev 2014-10-24 15:09:39 +00:00
Christoph Studer
c4f03e9fcf am 8b417054: am 55abbfa0: Merge "NoMan: Log canceled notifications" into lmp-mr1-dev 
* commit '8b4170547ee118b0b7f8fae2cbba1b799f91d2b4':
  NoMan: Log canceled notifications
 2014-10-24 15:03:13 +00:00
Christoph Studer
7ffa8dad6f am c10f39d5: am 5c1a4965: Merge "SysUI/NoMan: Log clicks on notification buttons" into lmp-mr1-dev 
* commit 'c10f39d536aebbdd7d6b30ac2dfcfcf6b51772f8':
  SysUI/NoMan: Log clicks on notification buttons
 2014-10-24 14:38:25 +00:00
Christoph Studer
81e5b5f2f8 NoMan: Log canceled notifications 
In addition to logging cancelation command, also log actually
canceled notifications via the new eventlog tag notification_canceled.

Bug: 18083122
Change-Id: I1e3e1e1368f39519f34c002ae374f318f647a401
 2014-10-24 16:34:54 +02:00
Christoph Studer
5c1a49651b Merge "SysUI/NoMan: Log clicks on notification buttons" into lmp-mr1-dev 2014-10-24 14:29:20 +00:00
Jason Monk
5560615871 am 467f9efe: am 104d2484: Merge "Show screen pinning toasts on all users" into lmp-mr1-dev 
* commit '467f9efe897cccc5deec5ee62fc33133fabe10e1':
  Show screen pinning toasts on all users
 2014-10-24 14:04:45 +00:00
Jason Monk
104d2484ec Merge "Show screen pinning toasts on all users" into lmp-mr1-dev 2014-10-24 13:55:55 +00:00
Adrian Roos
621823e064 am 53f30ec2: am bcd07652: Add API for querying trusted state 
* commit '53f30ec270db8c6b92ff06579cf4c591efe2544b':
  Add API for querying trusted state
 2014-10-24 13:27:39 +00:00
Adrian Roos
bcd076525c Add API for querying trusted state 
Bug: 18084166
Change-Id: Ic755461cc6978943aef4943def93a0e38a1c96c0
 2014-10-24 13:59:45 +02:00
Yuncheol Heo
b10d25fc96 am ddb863f4: am 5b062e07: Merge "CEC: Fix apilint errors." into lmp-mr1-dev 
* commit 'ddb863f42832e5dcc0f5167ce5ba7ecea2d977a4':
  CEC: Fix apilint errors.
 2014-10-24 10:39:50 +00:00
Yuncheol Heo
2b0da5c4c8 CEC: Fix apilint errors. 
- Change 'protected' to 'package private'.
- Change '@hide' to '{@hide}' for methods which should be still hidden
  for linting.
- Rename addVendorCommandListener to setVendorCommandListener and make sure to be called once.
- Fix the implementation of removeHotplugEventListener().

Bug: 18063669
Change-Id: I5c032736f17bab9518f21596f7adeac2f88ba4c1
 2014-10-24 15:30:48 +09:00
Takayuki Hoshi
c1e8f471db am ee57224c: Merge "Fix a bug where LocationManager\'s addGpsStatusListener does not throw a SecurityException if LocationManagerService.mGpsStatusProvider is null even when ACCESS_FINE_LOCATION permission is not present." into lmp-mr1-dev 
automerge: e6ad5f7

* commit 'e6ad5f75fcbbe1555411fe1923d5bb07977877d7':
  Fix a bug where LocationManager's addGpsStatusListener does not throw a SecurityException if LocationManagerService.mGpsStatusProvider is null even when ACCESS_FINE_LOCATION permission is not present.
 2014-10-24 04:31:04 +00:00
Takayuki Hoshi
ee57224c0f Merge "Fix a bug where LocationManager's addGpsStatusListener does not throw a SecurityException if LocationManagerService.mGpsStatusProvider is null even when ACCESS_FINE_LOCATION permission is not present." into lmp-mr1-dev 2014-10-24 04:02:52 +00:00
Wonsik Kim
fe86d9247a Merge "TIF: fix wrong config comparison & confusing method name" into lmp-mr1-dev automerge: cfc7323 
automerge: d651007

* commit 'd6510073e7c969c49713f57c0625bb445f8ea210':
  TIF: fix wrong config comparison & confusing method name
 2014-10-24 02:08:06 +00:00
Svetoslav
eed63916a1 am bd6fabe2: Merge "APIs for an accessibility service to put interaction tracking overlays." into lmp-mr1-dev 
automerge: 89e7ffe

* commit '89e7ffedadd20a3091e72b42f86c500452df193c':
  APIs for an accessibility service to put interaction tracking overlays.
 2014-10-24 02:04:11 +00:00
Wonsik Kim
cfc73237e9 Merge "TIF: fix wrong config comparison & confusing method name" into lmp-mr1-dev 2014-10-24 01:34:05 +00:00
Svetoslav
bd6fabe2ae Merge "APIs for an accessibility service to put interaction tracking overlays." into lmp-mr1-dev 2014-10-23 23:17:21 +00:00
Jason Monk
a585268aff Show screen pinning toasts on all users 
Bug: 17657660
Change-Id: I964a210e7fb105e9494a7ab7f383aa9d141ba136
 2014-10-23 14:12:19 -04:00
Craig Mautner
e9d65deb3d am 2abc8aa0: am 105e8f3e: Merge "Fix dumpsys display apptoken ordering." into lmp-mr1-dev 
* commit '2abc8aa032c5e4d7caaac196c1ecb5bb57d459bd':
  Fix dumpsys display apptoken ordering.
 2014-10-23 15:58:27 +00:00
Craig Mautner
d39c01c93c resolved conflicts for merge of 933d807c to lmp-mr1-dev-plus-aosp 
Change-Id: I183baf510e084e07244a8583c0bd162cd9715b50
 2014-10-23 08:48:36 -07:00
Bryce Lee
1d9184035d am 477fa012: am 49cb52e2: Merge "resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev" into lmp-mr1-dev 
* commit '477fa012865c3c59ebc2dd834c53c7ee33fe3a95':
  [Theater Mode] framework implementation through global setting
 2014-10-23 08:01:57 +00:00
Takayuki Hoshi
b254ab6add Fix a bug where LocationManager's addGpsStatusListener does not throw a 
SecurityException if LocationManagerService.mGpsStatusProvider is null
even when ACCESS_FINE_LOCATION permission is not present.

Tested under Nexus 5 and Molly with lmp-mr1-dev build with
android.location2.cts.LocationManagerTest#testGpsStatusListener CTS
test case such that it has been modified to expect SecurityException
only from .addGpsStatusListener.

Bug: 18095673
Change-Id: I09f9e7224a3b0eab91001f5092f0ef6e0ada7b08
 2014-10-23 16:46:02 +09:00
Craig Mautner
b9b62b06bb am 52656916: am 4c101015: Merge "Avoid to skip app window due to un-assigned sending to bottom state while app window sort" 
* commit '52656916e35b08013bf776b3603d6cecba287a1e':
  Avoid to skip app window due to un-assigned sending to bottom state while app window sort
 2014-10-23 03:17:35 +00:00
Craig Mautner
105e8f3e9b Merge "Fix dumpsys display apptoken ordering." into lmp-mr1-dev 2014-10-23 00:26:06 +00:00
Craig Mautner
74ff66e26a am 5cd68ee4: Merge "Cherry pick task movement changes from aosp" into lmp-sprout-dev 
* commit '5cd68ee4dfeaf74a31a0a62e5d0a60951cddc3bc':
  Cherry pick task movement changes from aosp
 2014-10-23 00:13:57 +00:00
Bryce Lee
fb1cf36aa7 resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev 
Change-Id: I9e4cabd2d8a34a348ae888f096c8d3c35226e960
 2014-10-22 16:56:08 -07:00
Wale Ogunwale
cbe7f81819 am 1546422e: am d0aae5a2: Merge "Fix issue #17789629: PopupWindow overlaps with navigation bar." into lmp-mr1-dev 
* commit '1546422ea7b0c62e6205ab9e85a370caf1d01756':
  Fix issue #17789629: PopupWindow overlaps with navigation bar.
 2014-10-22 22:39:35 +00:00
Wale Ogunwale
d0aae5a222 Merge "Fix issue #17789629: PopupWindow overlaps with navigation bar." into lmp-mr1-dev 2014-10-22 22:17:19 +00:00
Adrian Roos
0c68420eb4 am 3768d224: am 96d3132b: am c19586a8: am 7b4a38b1: Delay discovery of system trust agents 
* commit '3768d22417a8efd3e6501486cfb6e042f7a40227':
  Delay discovery of system trust agents
 2014-10-22 21:18:03 +00:00
Adrian Roos
96d3132bd0 am c19586a8: am 7b4a38b1: Delay discovery of system trust agents 
* commit 'c19586a8055b27bc7c7cc3ac3e1f38eec8cc82a9':
  Delay discovery of system trust agents
 2014-10-22 20:45:26 +00:00
Craig Mautner
5cd68ee4df Merge "Cherry pick task movement changes from aosp" into lmp-sprout-dev 2014-10-22 20:38:06 +00:00
Christopher Tate
44d7556bfa am 339f0a57: am 6ab86274: Merge "Don\'t cancel scheduled jobs when packages are updated" into lmp-mr1-dev 
* commit '339f0a57d46447b1bd9286b8f891686f80b746a4':
  Don't cancel scheduled jobs when packages are updated
 2014-10-22 20:37:15 +00:00
Bryce Lee
f03ba4f13b Merge "[Theater Mode] framework implementation through global setting" into lmp-sprout-dev 2014-10-22 20:33:08 +00:00
Craig Mautner
cbd84af39a Cherry pick task movement changes from aosp 
The following cherry picks from aosp contain code that keep windows
tracking the task movement.

https://android-review.googlesource.com/#/c/111380/
https://android-review.googlesource.com/#/c/109930

Maybe fixes bug 15729183.

Change-Id: Ida69fe365b06025d119e32b22a8d04958cdbabf3
 2014-10-22 13:28:40 -07:00
Christoph Studer
4da84cd565 SysUI/NoMan: Log clicks on notification buttons 
Introduce notification_action_click logtag that is logged whenever
the user clicks any notification button. For standard templates, we
also log the index of the pressed action button.

Bug: 18064190
Change-Id: Icb07795ff711729d16bde0b7e03d13c2f466779c
 2014-10-22 20:18:14 +02:00
Christopher Tate
aad67a3e48 Don't cancel scheduled jobs when packages are updated 
Only cancel the app's jobs when it is fully uninstalled, not when
it's being updated to a newer version.

Bug 18059252

Change-Id: I6cf617013ec8e9e9abd90e366d7a6ab0711790de
 2014-10-22 11:16:33 -07:00
Craig Mautner
e8b85fd419 Fix dumpsys display apptoken ordering. 
Ordering was bottom up stack ordering but top down apptoken ordering
within each stack. This makes it top down ordering throughout the
dump.

Change-Id: Ie15dbbfc3b21b8df101a0803e556094142dc408e
 2014-10-22 09:23:25 -07:00
Wale Ogunwale
cfb2a8d09a am a14f69f5: am f7fb3acf: Merge "Fix issue #17674789: Recents icon resets if persist mode is \'persistNever\'" into lmp-mr1-dev 
* commit 'a14f69f5d9a545e8aed17857c57b1ad955fb71da':
  Fix issue #17674789: Recents icon resets if persist mode is 'persistNever'
 2014-10-22 15:52:41 +00:00
Wale Ogunwale
f7fb3acf8f Merge "Fix issue #17674789: Recents icon resets if persist mode is 'persistNever'" into lmp-mr1-dev 2014-10-22 15:43:53 +00:00
Wonsik Kim
8f24a8b60f TIF: fix wrong config comparison & confusing method name 
TvStreamConfig should do deep comparison in TvInputHardwareManager
where the object gets created from binder calls. In addition to this
fix, modify [aA]ddStream to [aA]ddOrUpdateStream so that the method
name better reflects what it does.

Bug: 18027719
Change-Id: I43fa668f91cb9433beee97ee31b4b1f58f21bfcf
 2014-10-22 16:27:39 +09:00
Craig Mautner
80a274c696 am 4816ed65: Merge "Debug for bug 18017409" into lmp-mr1-dev 
automerge: 880eb34

* commit '880eb34f24fd2550a1051025e13816b76c0b6af1':
  Debug for bug 18017409
 2014-10-22 05:25:18 +00:00