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

211044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zhentao Sun
d6a94f495a am aded82ce: am 6d8bdb50: am 5536d447: Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev 
* commit 'aded82ce3134b7f8a2db7e4e7462e16e0428ef96':
  Changed the vibration duration from 1s to 750ms.
 2015-09-09 00:59:39 +00:00
Zhentao Sun
aded82ce31 am 6d8bdb50: am 5536d447: Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev 
* commit '6d8bdb50b0cd26629a18ae3124fb29673069493b':
  Changed the vibration duration from 1s to 750ms.
 2015-09-09 00:48:18 +00:00
Lorenzo Colitti
fd18370675 am 22262f31: am 0bc35668: am 017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev 
* commit '22262f31b964d595b56eb1277e4d88550a03e54c':
  Require the new PACKET_KEEPALIVE_OFFLOAD permission.
  Add an error code for generic hardware error.
  Fix bugs and crashes in PacketKeepalive API.
  Add tests for the PacketKeepalive API.
  Add a PACKET_KEEPALIVE_OFFLOAD permission.
  Use a CountDownLatch instead of sleep() in NetworkFactory tests.
  Get rid of shortSleep() in ConnectivityServiceTest.
  Make ConnectivityServiceTest a bit more readable.
 2015-09-09 00:45:42 +00:00
Zhentao Sun
6d8bdb50b0 am 5536d447: Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev 
* commit '5536d4477572e437c95111630d5c2723350d99a5':
  Changed the vibration duration from 1s to 750ms.
 2015-09-09 00:38:48 +00:00
Lorenzo Colitti
22262f31b9 am 0bc35668: am 017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev 
* commit '0bc356687e022fa1ae611c4ebeb0e0622810d7e4':
  Require the new PACKET_KEEPALIVE_OFFLOAD permission.
  Add an error code for generic hardware error.
  Fix bugs and crashes in PacketKeepalive API.
  Add tests for the PacketKeepalive API.
  Add a PACKET_KEEPALIVE_OFFLOAD permission.
  Use a CountDownLatch instead of sleep() in NetworkFactory tests.
  Get rid of shortSleep() in ConnectivityServiceTest.
  Make ConnectivityServiceTest a bit more readable.
 2015-09-09 00:38:42 +00:00
Zhentao Sun
5536d44775 Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev 2015-09-09 00:29:03 +00:00
Jorim Jaggi
6198a70371 am 2a198de7: am 975ceef6: am 52429b4a: Cancel animation when hiding Keyguard 
* commit '2a198de79d0d5b93168a3fccd45977f5731b3451':
  Cancel animation when hiding Keyguard
 2015-09-09 00:28:48 +00:00
Lorenzo Colitti
0bc356687e am 017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev 
* commit '017223acda5bfe16cb87d0a33d72dd28d2fccd3b':
  Require the new PACKET_KEEPALIVE_OFFLOAD permission.
  Add an error code for generic hardware error.
  Fix bugs and crashes in PacketKeepalive API.
  Add tests for the PacketKeepalive API.
  Add a PACKET_KEEPALIVE_OFFLOAD permission.
  Use a CountDownLatch instead of sleep() in NetworkFactory tests.
  Get rid of shortSleep() in ConnectivityServiceTest.
  Make ConnectivityServiceTest a bit more readable.
 2015-09-09 00:26:53 +00:00
Jorim Jaggi
2a198de79d am 975ceef6: am 52429b4a: Cancel animation when hiding Keyguard 
* commit '975ceef616aac6de561c4a4e1d82a636f5cf37e3':
  Cancel animation when hiding Keyguard
 2015-09-09 00:19:24 +00:00
Lorenzo Colitti
017223acda Merge changes from topic 'packet-keepalive-fixes' into mnc-dr-dev 
* changes:
  Require the new PACKET_KEEPALIVE_OFFLOAD permission.
  Add an error code for generic hardware error.
  Fix bugs and crashes in PacketKeepalive API.
  Add tests for the PacketKeepalive API.
  Add a PACKET_KEEPALIVE_OFFLOAD permission.
  Use a CountDownLatch instead of sleep() in NetworkFactory tests.
  Get rid of shortSleep() in ConnectivityServiceTest.
  Make ConnectivityServiceTest a bit more readable.
 2015-09-09 00:18:39 +00:00
Selim Cinek
09fd58fd2c am 89d80472: am ad69e53e: am edf47486: Removed the secure camera launcher 
* commit '89d804727473009fe8e53a0040f0ac70b3bd221a':
  Removed the secure camera launcher
 2015-09-09 00:16:04 +00:00
Jorim Jaggi
975ceef616 am 52429b4a: Cancel animation when hiding Keyguard 
* commit '52429b4a8b9be501f52df62e77c3e4bbb5bf0c3f':
  Cancel animation when hiding Keyguard
 2015-09-09 00:12:31 +00:00
Selim Cinek
89d8047274 am ad69e53e: am edf47486: Removed the secure camera launcher 
* commit 'ad69e53e7ee3fdaaff676ae5d0e99f6b267675f9':
  Removed the secure camera launcher
 2015-09-09 00:08:11 +00:00
Jorim Jaggi
52429b4a8b Cancel animation when hiding Keyguard 
So we don't end up in a wrong state.

Bug: 23692022
Change-Id: If40eb66499c95b82d86873dbbd6ccc64468373b2
 2015-09-09 00:04:23 +00:00
Selim Cinek
ad69e53e7e am edf47486: Removed the secure camera launcher 
* commit 'edf47486507f5edad1d1d8e6091b9a82f9e56930':
  Removed the secure camera launcher
 2015-09-08 23:58:58 +00:00
Selim Cinek
edf4748650 Removed the secure camera launcher 
With Android M, the system correctly handles camera arbitration
and therefore the secure camera launcher was only adding delay.

Bug: 23713450
Change-Id: Icd5e7883f3560bfd0c9b5f7bd93675847949469b
 2015-09-08 23:49:59 +00:00
Zhentao Sun
e9cb08209f Changed the vibration duration from 1s to 750ms. 
Fixed b/23727634.

Change-Id: Ie03b26f7b8faee8d61d772041351729995f7088c
 2015-09-08 15:41:25 -07:00
Android Git Automerger
c8abdab5be am 07b3195f: am c698ece7: am 3bed3bf4: am 92aeac34: am 1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev 
* commit '07b3195f7b156d9123797fac9160bc27cb17263c':
  docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
 2015-09-08 22:19:50 +00:00
Cheryl Potter
698e90b1f0 am 27a85cca: am fb53f115: am d35c7940: am 2c31a0d7: am 9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet 
* commit '27a85cca7c001ec47749feb60461081f14b2dfe3':
  docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
 2015-09-08 22:19:44 +00:00
Android Git Automerger
07b3195f7b am c698ece7: am 3bed3bf4: am 92aeac34: am 1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev 
* commit 'c698ece7cf5d2651741439921f7a241a4f51354b':
  docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
 2015-09-08 22:13:28 +00:00
Cheryl Potter
27a85cca7c am fb53f115: am d35c7940: am 2c31a0d7: am 9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet 
* commit 'fb53f11515554f618d5888c8137119bcc4f316cb':
  docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
 2015-09-08 22:13:22 +00:00
Android Git Automerger
c698ece7cf am 3bed3bf4: am 92aeac34: am 1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev 
* commit '3bed3bf498eadcaa760608a415c66e017d2eb690':
  docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
 2015-09-08 22:04:36 +00:00
Cheryl Potter
fb53f11515 am d35c7940: am 2c31a0d7: am 9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet 
* commit 'd35c7940112fa7edae03a1b43670157787a69d3d':
  docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
 2015-09-08 22:04:32 +00:00
Android Git Automerger
3bed3bf498 am 92aeac34: am 1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev 
* commit '92aeac3499e91985a266590aff88b06a9633b667':
  docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
 2015-09-08 21:55:50 +00:00
Cheryl Potter
d35c794011 am 2c31a0d7: am 9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet 
* commit '2c31a0d774cebb9603d3dd7f904af20dce4f3bd4':
  docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
 2015-09-08 21:55:46 +00:00
Android Git Automerger
92aeac3499 am 1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev 
* commit '1c88f605629a5f1647a8af1fdcfe0fb6e3eea847':
  docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
 2015-09-08 21:46:08 +00:00
Cheryl Potter
2c31a0d774 am 9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet 
* commit '9e28efe4e79402e1ae9c92579d4ea2bc5b4bb664':
  docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
 2015-09-08 21:46:02 +00:00
Android Git Automerger
1c88f60562 Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev 2015-09-08 21:37:33 +00:00
Cheryl Potter
9e28efe4e7 docs: change intro and title for contacts and sign-in lesson, and remove empty bullet 
b/22822607

Change-Id: Ib8b26e2ebe651fc3d9a1b9c89183ab62128d5e20
 2015-09-08 21:36:54 +00:00
Cheryl Potter
e335472def am 4b32b3f4: Merge "docs: change intro and title for contacts and sign-in lesson, and remove empty bullet" into mnc-preview-docs 
* commit '4b32b3f43fe8e27ffdb19d51364ebd99a3503e79':
  docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
 2015-09-08 21:36:35 +00:00
xin He
10c5dad9bb am fb4e0323: am 2248874b: am ee1babec: Merge "Introduce config_wifi_revert_country_code_on_cellular_loss" into mnc-dr-dev 
* commit 'fb4e0323a248c720170e010ea97299bf3f7415d1':
  Introduce config_wifi_revert_country_code_on_cellular_loss
 2015-09-08 21:31:35 +00:00
Cheryl Potter
4b32b3f43f Merge "docs: change intro and title for contacts and sign-in lesson, and remove empty bullet" into mnc-preview-docs 2015-09-08 21:28:06 +00:00
xin He
fb4e0323a2 am 2248874b: am ee1babec: Merge "Introduce config_wifi_revert_country_code_on_cellular_loss" into mnc-dr-dev 
* commit '2248874b8b7503b484556a1b46fdb23379fbc107':
  Introduce config_wifi_revert_country_code_on_cellular_loss
 2015-09-08 21:20:02 +00:00
xin He
2248874b8b am ee1babec: Merge "Introduce config_wifi_revert_country_code_on_cellular_loss" into mnc-dr-dev 
* commit 'ee1babecd204def48feb1fcf648dbed5cd760697':
  Introduce config_wifi_revert_country_code_on_cellular_loss
 2015-09-08 21:09:13 +00:00
Jorim Jaggi
ae44c2857d am dee90112: am 10352f7a: am 5e8e1c63: Do not expand notifications with expand gesture when disallowed 
* commit 'dee90112ce6d47a5740fd60449f948c37a8956e4':
  Do not expand notifications with expand gesture when disallowed
 2015-09-08 21:08:40 +00:00
xin He
ee1babecd2 Merge "Introduce config_wifi_revert_country_code_on_cellular_loss" into mnc-dr-dev 2015-09-08 21:01:49 +00:00
Jorim Jaggi
dee90112ce am 10352f7a: am 5e8e1c63: Do not expand notifications with expand gesture when disallowed 
* commit '10352f7a48433b5b76cd5d35a5eec6c3df203a1f':
  Do not expand notifications with expand gesture when disallowed
 2015-09-08 20:58:56 +00:00
Jorim Jaggi
10352f7a48 am 5e8e1c63: Do not expand notifications with expand gesture when disallowed 
* commit '5e8e1c63774da8c013fad18a63eac691cdc9646f':
  Do not expand notifications with expand gesture when disallowed
 2015-09-08 20:50:53 +00:00
Jorim Jaggi
5e8e1c6377 Do not expand notifications with expand gesture when disallowed 
Bug: 23596083
Change-Id: Iba88abce317e9d3a9c675a846261f35b1daee22a
 2015-09-08 18:51:00 +00:00
Cheryl Potter
a63d058b0a docs: change intro and title for contacts and sign-in lesson, and remove empty bullet 
b/22822607

Change-Id: Ib8b26e2ebe651fc3d9a1b9c89183ab62128d5e20
 2015-09-08 10:49:59 -07:00
Lorenzo Colitti
b988466312 Require the new PACKET_KEEPALIVE_OFFLOAD permission. 
Bug: 23884210
Change-Id: I50a1a647a69deaba92e73021ee7d6cc0f3eb1eee
 2015-09-09 00:16:57 +09:00
Lorenzo Colitti
9d1284eba7 Add an error code for generic hardware error. 
This is necessary because currently the wifi code just returns
whatever hardware-specific integer it gets back from the HAL,
which is bad because that will be interpreted by the caller as
one of the error codes defined in this class.

In parallel we'll also modify the wifi code to return this new
error code if the hardware returns an error.

Bug: 21405946
Change-Id: Ic9fa1193ced69a4e7ff543e397221c89b10a5a13
 2015-09-09 00:16:57 +09:00
Lorenzo Colitti
9acca09527 Fix bugs and crashes in PacketKeepalive API. 
Bug: 22606153
Bug: 23820819
Bug: 23884210
Change-Id: I1bf82094ec664baed345e9fb137fada0cbf4b7a0
 2015-09-09 00:16:56 +09:00
Lorenzo Colitti
7914ce5dd4 Add tests for the PacketKeepalive API. 
This currently fails in many different ways, but it tells us what
to fix.

Bug: 22606153
Bug: 23884210
Change-Id: If2e5ee0a8d7b26cad67d3d566ed5b1383e0db096
 2015-09-09 00:16:56 +09:00
Lorenzo Colitti
7b70036abc Add a PACKET_KEEPALIVE_OFFLOAD permission. 
Bug: 23884210
Change-Id: I0f9207ac9b9c07c676f64f2748905e523e891501
 2015-09-09 00:16:55 +09:00
Lorenzo Colitti
ffa390b6f3 Use a CountDownLatch instead of sleep() in NetworkFactory tests. 
This makes testNetworkFactoryRequests 2-3 times faster.

Bug: 22606153
Change-Id: I9657b6929e77f23ec811d0ab57b2ba974f0b6a69
 2015-09-08 16:41:47 +09:00
Lorenzo Colitti
e58961aa5f Get rid of shortSleep() in ConnectivityServiceTest. 
Instead, use IdleHandler to wait for things to become idle.

Bug: 22606153
Change-Id: Ic6ab93ad4d336b40962f9be1096629a44b63ee2f
 2015-09-08 16:41:47 +09:00
Nick Armstrong-Crews
13d2fa50b0 am 740cf71c: am 56ecfcce: Handle KEYCODE_SOFT_SLEEP from Ungaze. 
* commit '740cf71c9978e5dcb0a68b6558531a52dc26d44f':
  Handle KEYCODE_SOFT_SLEEP from Ungaze.
 2015-09-08 05:28:51 +00:00
Nick Armstrong-Crews
740cf71c99 am 56ecfcce: Handle KEYCODE_SOFT_SLEEP from Ungaze. 
* commit '56ecfcce6c88fc80cf509effcebb124bbe0c79f8':
  Handle KEYCODE_SOFT_SLEEP from Ungaze.
 2015-09-08 05:23:49 +00:00
Nick Armstrong-Crews
56ecfcce6c Handle KEYCODE_SOFT_SLEEP from Ungaze. 
Needed for Ungaze to trigger "soft sleep" (respecting wake locks); operates by
sending new KEYCODE_SOFT_SLEEP to PhoneWindowManager, which calls
PowerManagerService's new method setUserInactiveOverride (thereby
causing immediate sleep, modulo wakelocks, upon next iteration of
PowerManagerService's main loop).

BUG: b/23589870
Change-Id: Iddafdde923605d119075e890eeda5d3fd3fd2bc7
 2015-09-07 21:46:50 -07:00