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

194988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
74652ebff1 am f3edbb55: Merge "Handle network info updates while scanning is paused" into mnc-dev 
* commit 'f3edbb55ddf45ba2b37c18dea9e2e80594b81523':
  Handle network info updates while scanning is paused
 2015-06-02 19:10:50 +00:00
Ruben Brunk
f991256bb9 am a90c453d: Merge "Make CameraService proxy retry behavior more lenient." into mnc-dev 
* commit 'a90c453d177d2437a64ae5a8a4b9097668f2c4ff':
  Make CameraService proxy retry behavior more lenient.
 2015-06-02 19:10:45 +00:00
Wale Ogunwale
b75c0517a2 am 16dbf0c7: Merge "Enabled WMS.DEBUG_STARTING_WINDOW" into mnc-dev 
* commit '16dbf0c79c6e8428c34f5da8c637baf5809f1748':
  Enabled WMS.DEBUG_STARTING_WINDOW
 2015-06-02 19:10:40 +00:00
Wale Ogunwale
28e00af912 am c9a04522: Merge "@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type." into mnc-dev 
* commit 'c9a0452244420b910ca3294f043f34ccc6a6044c':
  @hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type.
 2015-06-02 19:10:35 +00:00
Jason Monk
f3edbb55dd Merge "Handle network info updates while scanning is paused" into mnc-dev 2015-06-02 18:59:46 +00:00
Ruben Brunk
a90c453d17 Merge "Make CameraService proxy retry behavior more lenient." into mnc-dev 2015-06-02 18:55:31 +00:00
Wale Ogunwale
16dbf0c79c Merge "Enabled WMS.DEBUG_STARTING_WINDOW" into mnc-dev 2015-06-02 18:55:10 +00:00
Wale Ogunwale
c9a0452244 Merge "@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type." into mnc-dev 2015-06-02 18:54:55 +00:00
Jason Monk
a296c69cc2 Handle network info updates while scanning is paused 
Bug: 21581533
Change-Id: I4216c3e9b64cb758e32dd93c39061f9d7a642ee0
 2015-06-02 14:52:22 -04:00
Andrew Flynn
00aeba9f50 am 1fad138f: Merge "Show Carrier Network Change icon SysUI even while connected" into mnc-dev 
* commit '1fad138f820e23de050f16f22b5ad757dc41eb10':
  Show Carrier Network Change icon SysUI even while connected
 2015-06-02 18:44:55 +00:00
Wale Ogunwale
9573ae1dee Enabled WMS.DEBUG_STARTING_WINDOW 
To debug starting window issue reported in comment #38
of b/21384482

Bug 21384482

Change-Id: I2fbafda5fa79448057cf27a65d1be9b96894770e
 2015-06-02 11:32:52 -07:00
Robin Lee
b35307343a am f4d9ecc5: Merge "Revert "Consistent documentation and annotations for DPMS"" into mnc-dev 
* commit 'f4d9ecc503e7e849ff37a4674680c7213d819592':
  Revert "Consistent documentation and annotations for DPMS"
 2015-06-02 18:29:45 +00:00
Robin Lee
9b286dd637 am 5de95550: Merge "Consistent documentation and annotations for DPMS" into mnc-dev 
* commit '5de95550b7741bfd7d4da54ea562afb8bb328397':
  Consistent documentation and annotations for DPMS
 2015-06-02 18:29:41 +00:00
Andrew Flynn
1fad138f82 Merge "Show Carrier Network Change icon SysUI even while connected" into mnc-dev 2015-06-02 18:28:23 +00:00
Robin Lee
f4d9ecc503 Merge "Revert "Consistent documentation and annotations for DPMS"" into mnc-dev 2015-06-02 18:25:43 +00:00
Robin Lee
49ec19ef6c Revert "Consistent documentation and annotations for DPMS" 
This reverts commit 695142a17a657d2c254ec4e1bfad9920f4c54832.

Change-Id: Iaa2abe7e8bcecc5177a395b0dab8f66cc7100d3d
 2015-06-02 18:25:28 +00:00
Robin Lee
5de95550b7 Merge "Consistent documentation and annotations for DPMS" into mnc-dev 2015-06-02 18:16:26 +00:00
Robin Lee
695142a17a Consistent documentation and annotations for DPMS 
Annotated all uses of the ComponentName parameter to methods in
DevicePolicyManager to indicate whether null is acceptable.

Deleted or fixed some inconsistent or poorly-worded documentation.

Bug: 21422939
Change-Id: I8d86d0968c2af3595f268828ea1625f1ed256d50
 2015-06-02 11:15:34 -07:00
Wale Ogunwale
3540f93654 @hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type. 
Bug: 21572285
Change-Id: Iff56a8ee5b91e02bd20afb7891bd94a0ec1abba9
 2015-06-02 11:07:07 -07:00
Olawale Ogunwale
0806a35928 am 5b9b66c7: Merge "Should reset mDismissKeyguard on keyguard secure change" into mnc-dev 
* commit '5b9b66c73c80697c1d3694a2d4ee975e409bd89d':
  Should reset mDismissKeyguard on keyguard secure change
 2015-06-02 18:01:40 +00:00
Olawale Ogunwale
0eac76cd6f am cdc7bf10: Merge "Fix null pointer dereference when security exception occurs" into mnc-dev 
* commit 'cdc7bf10dd19d1fa233d51ba46151310f4e0fd3f':
  Fix null pointer dereference when security exception occurs
 2015-06-02 18:01:35 +00:00
Olawale Ogunwale
8accd8563e am cbf400b1: Merge "WindowManagerService not propagating X and Y steps" into mnc-dev 
* commit 'cbf400b1642913d8640ae0ce59e910e12d7e4f5d':
  WindowManagerService not propagating X and Y steps
 2015-06-02 18:01:31 +00:00
Olawale Ogunwale
5b9b66c73c Merge "Should reset mDismissKeyguard on keyguard secure change" into mnc-dev 2015-06-02 17:51:22 +00:00
Olawale Ogunwale
cdc7bf10dd Merge "Fix null pointer dereference when security exception occurs" into mnc-dev 2015-06-02 17:51:03 +00:00
Olawale Ogunwale
cbf400b164 Merge "WindowManagerService not propagating X and Y steps" into mnc-dev 2015-06-02 17:50:38 +00:00
Carlos Valdivia
2ca505718d am 2ed6369c: Merge "System Health: Support expiring tokens" into mnc-dev 
* commit '2ed6369c5d856aa2e1f9972d52f0f3c2526c713a':
  System Health: Support expiring tokens
 2015-06-02 17:36:03 +00:00
Dmitriy Ivanov
b0128eb0d5 am bb0e5391: Merge "Print exception stacktrace on failed scanPackageLI" into mnc-dev 
* commit 'bb0e5391b82912a620b29a0f8b2af47649e7f9ce':
  Print exception stacktrace on failed scanPackageLI
 2015-06-02 17:35:59 +00:00
Wei Wang
9619528558 am 6f54da32: Merge "Expose a few system APIs for BLE scan only mode." into mnc-dev 
* commit '6f54da32c9c5c766ba15a6e9cc4be0c27276fc68':
  Expose a few system APIs for BLE scan only mode.
 2015-06-02 17:35:54 +00:00
Ruben Brunk
28388e8ab3 Make CameraService proxy retry behavior more lenient. 
Bug: 21527760
Change-Id: I70abea66f1d1fafffcfdd8e30b0cff244f814e59
 2015-06-02 10:35:53 -07:00
Carlos Valdivia
2ed6369c5d Merge "System Health: Support expiring tokens" into mnc-dev 2015-06-02 17:31:29 +00:00
Dmitriy Ivanov
bb0e5391b8 Merge "Print exception stacktrace on failed scanPackageLI" into mnc-dev 2015-06-02 17:31:03 +00:00
Wei Wang
6f54da32c9 Merge "Expose a few system APIs for BLE scan only mode." into mnc-dev 2015-06-02 17:24:00 +00:00
Wei Wang
f9e3e9e3dd Expose a few system APIs for BLE scan only mode. 
Bug: 21562349
Change-Id: Ifc58efcf01edac5b4f9e5266adb966e7bc492209
 2015-06-02 10:22:20 -07:00
Carlos Valdivia
91979be880 System Health: Support expiring tokens 
In the past android:customTokens=true authenticators were required to handle
their own token caching. This is detrimental for battery when high traffic
authenticators are constantly spinning up processes to start services to do
file io to check their own caches.  This change allows authenticator
implementers to optionally let the framework do some of the work for them by
providing the framework with a expiration time.

The AccountManagerService will make a best effort to re-use the cached
token if possible.

Bug: 21530782

Change-Id: I16a7edba36a220e3891e55cf61c725c2be863323
 2015-06-02 09:58:18 -07:00
Svet Ganov
a332605fb7 am 8fa8b95c: Merge "Respect accessibility importance for before/after node ordering." into mnc-dev 
* commit '8fa8b95c9d38183497f08efc6bdf4d2c56a4116c':
  Respect accessibility importance for before/after node ordering.
 2015-06-02 16:57:18 +00:00
Alan Viverette
0693b7c4f6 am 54310008: Merge "Remove strict mode violation from value to string coercion" into mnc-dev 
* commit '5431000830551959db15038da8f057c2e993d01a':
  Remove strict mode violation from value to string coercion
 2015-06-02 16:57:12 +00:00
Svet Ganov
8fa8b95c9d Merge "Respect accessibility importance for before/after node ordering." into mnc-dev 2015-06-02 16:49:47 +00:00
Alan Viverette
5431000830 Merge "Remove strict mode violation from value to string coercion" into mnc-dev 2015-06-02 16:47:53 +00:00
Svet Ganov
2dca7ca9bf Respect accessibility importance for before/after node ordering. 
One can set a view to be visited before/after another one for
accessibility but the before/after target views were always added
to the node info for the view regardless if they are included
for accessiilbity. Now the target viwes are reported only if they
should be included for accessibility.

Change-Id: Iba64e6f0ee0dc090c8c3e6a0a940df8c7ecd49d9
 2015-06-02 09:45:19 -07:00
Andrew Flynn
55fc8004ad Show Carrier Network Change icon SysUI even while connected 
Taking connect/disconnect events into accounts results in frequent jank
while trying to show the icon.

Bug: 21504588
Change-Id: If271980cc46cfc20f80083de17a4b57c42439069
 2015-06-02 12:41:53 -04:00
Selim Cinek
882531da96 am 233241f1: Fixed a crash with HUNs 
* commit '233241f13d5d7f841d3db80408429d4d0a528c78':
  Fixed a crash with HUNs
 2015-06-02 13:17:10 +00:00
Selim Cinek
233241f13d Fixed a crash with HUNs 
Bug: 21500600
Change-Id: Idf0a7be5d58bb5c666b930a0beada1e0ed2869aa
 2015-06-02 13:01:11 +00:00
Andre Eisenbach
7e00366b8f am 60598075: Bluetooth PAN: Set isPreferred to true (1/2) 
* commit '60598075a0d54dcb4287d77c91b946e6c407a669':
  Bluetooth PAN: Set isPreferred to true (1/2)
 2015-06-02 09:44:49 +00:00
Nitin Shivpure
305c194125 am 1f8b8448: Bluetooth: Fix to avoid framework reboot during monkey testing 
* commit '1f8b844870eb9acb334b541b0b41de37e000d2f0':
  Bluetooth: Fix to avoid framework reboot during monkey testing
 2015-06-02 09:44:45 +00:00
Andre Eisenbach
60598075a0 Bluetooth PAN: Set isPreferred to true (1/2) 
isPreferred must always be true for PAN so that the DUT can initiate
a PANU connection with the remote device not only from the internet
access menu in the profile setting, but also from the paired device
list menu.

Currently isPreferred is only true when PAN is in connected state
for the PANU role, so it will return false when the PAN profile is
not connected and the PANU connection will never be initiated
from the paired device list menu.

Change-Id: I120e681a113f56b74b45e01870adf96cdc2ca262
 2015-06-02 01:58:58 -07:00
Nitin Shivpure
1f8b844870 Bluetooth: Fix to avoid framework reboot during monkey testing 
When running monkeyrunner, sometimes the framework is disconnected due
to an unhandled Java exception while binding the PAN service (when it
is unsuccessful). Handing the Java exception while binding PAN service
solves this issue.

Change-Id: Idea710593a3f9496305f636042605303e73e7749
 2015-06-02 01:23:11 -07:00
Seigo Nonaka
0e5772324d am ac1f0a1a: Merge "Hide the software input based on its state." into mnc-dev 
* commit 'ac1f0a1a9169f8bbbddba68b0410d5530512da63':
  Hide the software input based on its state.
 2015-06-02 08:07:53 +00:00
Lorenzo Colitti
90546cd1a1 am 8f602cdd: Merge "Fix DHCP lease time parsing." into mnc-dev 
* commit '8f602cdd38f7345eb0a8ec34ae4e51a333edce6c':
  Fix DHCP lease time parsing.
 2015-06-02 07:55:50 +00:00
Seigo Nonaka
ac1f0a1a91 Merge "Hide the software input based on its state." into mnc-dev 2015-06-02 07:55:49 +00:00
Erik Kline
4e915dff5b am 168bfef1: Merge "pass a defensive copy of DhcpResults" into mnc-dev 
* commit '168bfef182b8e631c93404f4e9e9c0176aa66ece':
  pass a defensive copy of DhcpResults
 2015-06-02 07:55:46 +00:00