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

29276 Commits

Author SHA1 Message Date
Bryce Lee
242a4f6e5d Merge "Don't allow stacks above pinned stack." into oc-dev am: 22d4ef008d 
am: e7ac364ae1

Change-Id: I2c8daf0f23090fedf2ed0b24f743a50efd4d3a54
 2017-04-17 17:16:09 +00:00
Bryce Lee
e7ac364ae1 Merge "Don't allow stacks above pinned stack." into oc-dev 
am: 22d4ef008d

Change-Id: I740f62046d5f37a634e8c656ee76a82ecb244ff1
 2017-04-17 17:07:09 +00:00
Dianne Hackborn
bcc7cebcdb Merge "Fix issue #35811414: Allow manifest receivers for ACTION_UID_REMOVED" 2017-04-17 17:03:00 +00:00
Bryce Lee
22d4ef008d Merge "Don't allow stacks above pinned stack." into oc-dev 2017-04-17 16:57:17 +00:00
Julia Reynolds
1ab0f123bb Merge "Also use the notification's sound for the misc channel" into oc-dev am: ed8f49efdc 
am: f6ca4cfcd2

Change-Id: I195ac4a4006cfc746b784f4f99d6fe42c93e40af
 2017-04-17 16:42:07 +00:00
Julia Reynolds
f6ca4cfcd2 Merge "Also use the notification's sound for the misc channel" into oc-dev 
am: ed8f49efdc

Change-Id: I268e2702a6fbe714276f38581493ef2a089007e8
 2017-04-17 16:33:11 +00:00
Julia Reynolds
b9e712ebde Also use the notification's sound for the misc channel 
Even if it's nonexistent.

Test: runtest systemui-notification
Change-Id: I1167fdf10b776460de696657dd49ab6f2be85753
Fixes: 37414045
 2017-04-17 14:33:30 +00:00
Todd Kennedy
56f715160e Merge "expose the instant app installer component" into oc-dev am: 676590d060 
am: 8d0dacb5b1

Change-Id: Id1df099740c6e108878c8f10aacceb59b42b0041
 2017-04-17 14:32:38 +00:00
Todd Kennedy
8d0dacb5b1 Merge "expose the instant app installer component" into oc-dev 
am: 676590d060

Change-Id: I48c05c84c2afba4bf68dfd42b834d8e6958f6744
 2017-04-17 14:22:35 +00:00
TreeHugger Robot
676590d060 Merge "expose the instant app installer component" into oc-dev 2017-04-17 14:17:27 +00:00
Jaewan Kim
d9c01f2532 Merge "MediaSessionService: Cache active sessions per an user" into oc-dev am: 5fc6e63e2e 
am: 18a6331772

Change-Id: I854db28eaf942b8d4b6035ccc35be65bf4eee774
 2017-04-17 07:39:11 +00:00
Jaewan Kim
18a6331772 Merge "MediaSessionService: Cache active sessions per an user" into oc-dev 
am: 5fc6e63e2e

Change-Id: I8a444b4b36fe01097dc3c4e21e0df8294ada56a1
 2017-04-17 07:29:40 +00:00
TreeHugger Robot
5fc6e63e2e Merge "MediaSessionService: Cache active sessions per an user" into oc-dev 2017-04-17 07:21:01 +00:00
TreeHugger Robot
7eb8260236 Merge changes I76ae853c,If94102c7 into oc-dev 
* changes:
  Ignore potential SystemProperties errors when setting net.dns
  Make ConnectivityServiceTest pass on wifi-only devices.
 2017-04-17 05:11:21 +00:00
Hugo Benichi
919f128a16 ConnectivityManager: unify prety printing of callback types. 
And also remove some small code duplication (checkNotNull).

Test: built, flashed, runtest frameworks-net
Change-Id: Id6c13bca9d12f70b88806032e0a4fa198efbedc6
 2017-04-17 08:50:58 +09:00
Dianne Hackborn
855aa45b88 Fix issue #35811414: Allow manifest receivers for ACTION_UID_REMOVED 
Test: booted and ran.
Change-Id: Id972da711188177ca3ac38a22efa04c5901e7d47
 2017-04-16 14:59:08 -07:00
Kevin Chyn
404a28de05 Merge "Keyguard should authenticate with FP even after getting valid FP" into oc-dev am: 4ea09f5ca4 
am: 54b5b6d710

Change-Id: Ic865f205b44d3ba1b851b571a69b97c7a393a958
 2017-04-15 07:16:41 +00:00
Kevin Chyn
54b5b6d710 Merge "Keyguard should authenticate with FP even after getting valid FP" into oc-dev 
am: 4ea09f5ca4

Change-Id: I9aa9104818078c058f5f5cefaf3e442873a072e8
 2017-04-15 07:11:00 +00:00
TreeHugger Robot
4ea09f5ca4 Merge "Keyguard should authenticate with FP even after getting valid FP" into oc-dev 2017-04-15 07:05:48 +00:00
TreeHugger Robot
d98f26e4f3 Merge changes from topics 'network_specifier', 'networkspecifier' into oc-dev 
* changes:
  [CM] Unhide the NetworkSpecifier as object API
  Make the NetworkSpecifier a class instead of a string.
  Add test coverage for NetworkSpecifiers.
 2017-04-15 02:16:14 +00:00
Sudheer Shanka
c5827c0a1a Merge "Add new api Activity.getStartInitiatedTime." into oc-dev am: 2359f016e2 
am: 225e594388

Change-Id: I64b956ebf369aa19e42920d71fdcac7713ce2c32
 2017-04-15 01:18:27 +00:00
Kevin Chyn
625a014006 Keyguard should authenticate with FP even after getting valid FP 
There may be strange states where the user is already authenticated
but still on the lockscreen. The user should be able to dismiss
keyguard in that state.

Fixes: 29306222

Test: unlock phone
go back to keyguard
swipe up screen half way
touch fingerprint sensor (icon should change to unlocked)
then touch fingerprint sensor again (keyguard should be dismissed)

Test: unlock phone and go to settings -> Pixel Imprint
lock phone, unlock phone with fingerprint
touch sensor again and make sure Pixel Imprint page also responds to FP
do this test at least 10 times

Change-Id: I86acd520a06a68fab3548dd4cf6153a7833114fe
 2017-04-14 17:33:14 -07:00
Sudheer Shanka
225e594388 Merge "Add new api Activity.getStartInitiatedTime." into oc-dev 
am: 2359f016e2

Change-Id: I8a2ab94f67894736188fd62df8503dfa637ad9ed
 2017-04-15 00:17:26 +00:00
Sudheer Shanka
2359f016e2 Merge "Add new api Activity.getStartInitiatedTime." into oc-dev 2017-04-15 00:09:32 +00:00
Sudheer Shanka
bc308988bd Add new api Activity.getStartInitiatedTime. 
This api will return the timestamp at which this activity start was last
initiated by the system. Implementation is wip.

Bug: 9058261
Test: cts-tradefed run singleCommand cts-dev -m CtsAppTestCases -t \
      android.app.cts.ActivityStartTimeTest

Change-Id: I396458ecefbb09108f414b95f9c0beb6d609a4e1
 2017-04-14 14:19:25 -07:00
Christopher Tate
ff2c721bff Merge "Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev am: 28dab313ee" into oc-dev-plus-aosp 
am: 09414003f5

Change-Id: Ibe8fb54fd2b10227e08d887b69767d472c098b7e
 2017-04-14 19:19:19 +00:00
Christopher Tate
b5573283ab Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev 
am: 28dab313ee

Change-Id: I369ba9ee166d4812f2df929903691352e7bafe11
 2017-04-14 19:09:27 +00:00
Julia Reynolds
ca7b2e3e71 Merge "Synchronize access to ranking helper records." into oc-dev am: bf777d46f2 
am: 00ac29e3dd

Change-Id: Ic6fec9eda6c3302d4893c6f5929ba5d8e8341850
 2017-04-14 19:05:09 +00:00
TreeHugger Robot
28dab313ee Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev 2017-04-14 19:04:35 +00:00
Julia Reynolds
6ad85d8211 Merge "Lock access to managed services." into oc-dev am: 8ac1452288 
am: 7e0a00e387

Change-Id: Ibe3e760716ff2ccfbb1432bbe431de33348d8cb0
 2017-04-14 19:03:58 +00:00
Julia Reynolds
00ac29e3dd Merge "Synchronize access to ranking helper records." into oc-dev 
am: bf777d46f2

Change-Id: I36dec49a567400d1acf6e13567de3f76319f91be
 2017-04-14 18:56:18 +00:00
TreeHugger Robot
bf777d46f2 Merge "Synchronize access to ranking helper records." into oc-dev 2017-04-14 18:52:40 +00:00
Tsukasa Hashimoto
9191faf4eb Merge "Add PID info into ANR crash log header" am: 2fe972c822 am: 5d57502c89 am: 5dbe26f0f1 
am: 4ae323995d

Change-Id: I2d83b2c741c8d6cbf730d093adc59ec80bf1899d
 2017-04-14 18:37:20 +00:00
Wale Ogunwale
0e502c0250 Merge "Move stack to front in-sync with task reparenting" into oc-dev am: c4555784be 
am: 7654775b8a

Change-Id: Icdfa610740ae34fe46e83dd3b604651392466ad9
 2017-04-14 18:34:34 +00:00
Julia Reynolds
7e0a00e387 Merge "Lock access to managed services." into oc-dev 
am: 8ac1452288

Change-Id: I425a6ee8a3f89149e87ce8269d679acc27363793
 2017-04-14 18:34:01 +00:00
Daniel Nishi
44f3507dfc Merge "Revert "Use the StorageStatsManager in FileCollector."" into oc-dev am: 864d53d6fc 
am: 33f74edaa4

Change-Id: Ifd1b2a4c522cb87bed58b47653292567a48c7aa2
 2017-04-14 18:32:11 +00:00
TreeHugger Robot
8ac1452288 Merge "Lock access to managed services." into oc-dev 2017-04-14 18:28:38 +00:00
Alan Viverette
14b3375e43 Merge "Remove unnecessary casts on calls to findViewById" into oc-dev am: 7c8ab2651b 
am: efc602c307

Change-Id: Id991d413933d8435a05b129bf13e917941371c01
 2017-04-14 18:25:53 +00:00
Tsukasa Hashimoto
4ae323995d Merge "Add PID info into ANR crash log header" am: 2fe972c822 am: 5d57502c89 
am: 5dbe26f0f1

Change-Id: I692162bdee8a93d49cd41967939aaab9f4c33224
 2017-04-14 18:19:22 +00:00
Tsukasa Hashimoto
5dbe26f0f1 Merge "Add PID info into ANR crash log header" am: 2fe972c822 
am: 5d57502c89

Change-Id: I5fc92088c55fed713716ea516a3b22e7cf00fcb0
 2017-04-14 18:13:50 +00:00
Treehugger Robot
2fe972c822 Merge "Add PID info into ANR crash log header" 2017-04-14 18:03:12 +00:00
Andrew Scull
1b67465918 Merge "Service for OEM lock management." into oc-dev am: e52a1bfede 
am: d4be031c76

Change-Id: I9ab76546a140062940c128abdc2b8b4072d3b0f2
 2017-04-14 18:01:24 +00:00
Hugo Benichi
f24e74942b Merge "Captive portal: rotate fallback urls" am: 76b3537dfd am: 605eafe0a5 am: 4479901ff3 
am: 43cdbc943d

Change-Id: I4f3bd72a8cfa75853474039e7f6e44a5a89bf950
 2017-04-14 17:55:26 +00:00
Winson Chung
ebb2bbba57 Merge "Fix issue where we weren't dismissing the pip menu activity." into oc-dev am: 2e86be7653 
am: 3a32d35723

Change-Id: Ie6ef27e0d233debca4884c5628c076121c8a5b34
 2017-04-14 17:53:03 +00:00
Wale Ogunwale
7654775b8a Merge "Move stack to front in-sync with task reparenting" into oc-dev 
am: c4555784be

Change-Id: Ia9ea6523bb84c8ca4fbdd02da888a3ffef8dc543
 2017-04-14 17:41:52 +00:00
Winson Chung
e0c9bc1582 Merge changes I789945c1,I532b0928,I62c6df8b,Ib2bd81ad into oc-dev am: 4191d99614 
am: 7031cdda50

Change-Id: I6eb6069005460d372288d79b8a2387518842e73f
 2017-04-14 17:40:39 +00:00
Dmitry Dementyev
25b5fa9d79 Merge "Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev am: 2a30085e5c" into oc-dev-plus-aosp 
am: 0bf753d2e5

Change-Id: I362b107071fc3f9c61a5e183d9a4fdd685ded1d7
 2017-04-14 17:33:46 +00:00
Wale Ogunwale
c4555784be Merge "Move stack to front in-sync with task reparenting" into oc-dev 2017-04-14 17:33:03 +00:00
Christopher Tate
b72714ee23 Merge "Merge "Turn down dynamic toggle for background restriction policy" into oc-dev am: 59047acea7" into oc-dev-plus-aosp 
am: c1c3855397

Change-Id: I6c2c43156183ac5389d4ce1b1df94b517540e384
 2017-04-14 17:26:00 +00:00
Daniel Nishi
33f74edaa4 Merge "Revert "Use the StorageStatsManager in FileCollector."" into oc-dev 
am: 864d53d6fc

Change-Id: I21cf2b0a245cfeaf0c788b3c869b441776ec5d0c
 2017-04-14 17:18:40 +00:00