Mike Dodd
3f5d76dd5e
am 7f2f96cc: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
...
* commit '7f2f96cce3f1663e3c1dccdde2c0f196b2b16e72':
Set default SMS/MMS app to com.android.messaging (new AOSP app).
2015-08-12 17:43:55 +00:00
Todd Kennedy
8af3406a45
am 24e4d48f: Merge "Promote system app permissions" into mnc-dev
...
* commit '24e4d48f56a6fca6974c5670b88a7b4da2180331':
Promote system app permissions
2015-08-12 17:43:52 +00:00
Michael Wright
d9c906e731
am e20493ea: Merge "Log last filtered sensor timestamp." into mnc-dev
...
* commit 'e20493ea5affdc417db1fc3fbb527781d6e51612':
Log last filtered sensor timestamp.
2015-08-12 17:43:48 +00:00
Wei Liu
a181770f35
Add a setting to enable cellular on boot.
...
b/22804423
Change-Id: Ifcee3a2a8bfbfab366c3f9dcd8926d500851bd32
2015-08-12 10:02:06 -07:00
Mike Dodd
7f2f96cce3
Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
2015-08-12 17:01:25 +00:00
Todd Kennedy
24e4d48f56
Merge "Promote system app permissions" into mnc-dev
2015-08-12 16:51:13 +00:00
Michael Wright
e20493ea5a
Merge "Log last filtered sensor timestamp." into mnc-dev
2015-08-12 16:32:11 +00:00
Michael Wright
6eabf57e58
Log last filtered sensor timestamp.
...
Bug: 22870354
Change-Id: Ib4efaa0f05bec81856c939c5c640eceff98d88ed
2015-08-12 16:53:24 +01:00
Todd Kennedy
8b3e6b0df1
Promote system app permissions
...
When upgrading from a pre-M version of Android, install permissions for
exisiting system are promoted to runtime permissions. This only happens
for apps that existed prior to the OTA. Other system apps targeting M
are not automatically granted any permissions.
Bug: 22970710
Change-Id: I964ee3f93c66ea43fbb1be6b5ac6b09ddea3c385
2015-08-12 08:26:15 -07:00
Narayan Kamath
c42acbdb65
am 088c4155: am 86b6d204: am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set.
...
* commit '088c4155b42081e929ce07507941a197ed0a9550':
Fall back to persist.sys.language/country if locale isn't set.
2015-08-12 10:49:49 +00:00
Narayan Kamath
088c4155b4
am 86b6d204: am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set.
...
* commit '86b6d204a5321bf2874c2cbee3452e674605c21f':
Fall back to persist.sys.language/country if locale isn't set.
2015-08-12 10:44:38 +00:00
Narayan Kamath
86b6d204a5
am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set.
...
* commit 'bf88205bef88f78ade5c6830e6203aa343387820':
Fall back to persist.sys.language/country if locale isn't set.
2015-08-12 10:39:13 +00:00
Narayan Kamath
bf88205bef
Fall back to persist.sys.language/country if locale isn't set.
...
This will prevent users from losing their language setting when they
take an OTA to M.
bug: 23021286
Change-Id: Ifb66f6bf6a940ab745edac709321f3009ec6eab4
2015-08-12 11:03:46 +01:00
Alex Klyubin
5665e0405f
am ab5bd5d8: am e950a4b2: am e19b76cb: Merge "Add more examples of generating/importing keys to Javadocs." into mnc-dev
...
* commit 'ab5bd5d83c8c26a0be5dfbda036923e67c967665':
Add more examples of generating/importing keys to Javadocs.
2015-08-12 06:00:39 +00:00
Alex Klyubin
ab5bd5d83c
am e950a4b2: am e19b76cb: Merge "Add more examples of generating/importing keys to Javadocs." into mnc-dev
...
* commit 'e950a4b22caaf849bfeb68768931e0e793877119':
Add more examples of generating/importing keys to Javadocs.
2015-08-12 05:52:37 +00:00
Alex Klyubin
e950a4b22c
am e19b76cb: Merge "Add more examples of generating/importing keys to Javadocs." into mnc-dev
...
* commit 'e19b76cbb50db816c535d6d4a5bf125f52c04eba':
Add more examples of generating/importing keys to Javadocs.
2015-08-12 05:46:35 +00:00
Alex Klyubin
e19b76cbb5
Merge "Add more examples of generating/importing keys to Javadocs." into mnc-dev
2015-08-12 05:42:29 +00:00
Lorenzo Colitti
64fcffd901
am f9ddfd23: am c7f2030f: am e022cb08: Merge "Don\'t attempt to stop the receive thread if we never started it." into mnc-dev
...
* commit 'f9ddfd23ace1d140d78745d7525e62a8f5f06ff6':
Don't attempt to stop the receive thread if we never started it.
2015-08-12 03:59:17 +00:00
Lorenzo Colitti
f9ddfd23ac
am c7f2030f: am e022cb08: Merge "Don\'t attempt to stop the receive thread if we never started it." into mnc-dev
...
* commit 'c7f2030ffc64bf60db020c4847fadef4c9c58ab5':
Don't attempt to stop the receive thread if we never started it.
2015-08-12 03:53:40 +00:00
Lorenzo Colitti
c7f2030ffc
am e022cb08: Merge "Don\'t attempt to stop the receive thread if we never started it." into mnc-dev
...
* commit 'e022cb085f6ebc2801f843bb47c9fd23f6daa3ea':
Don't attempt to stop the receive thread if we never started it.
2015-08-12 03:45:30 +00:00
Lorenzo Colitti
e022cb085f
Merge "Don't attempt to stop the receive thread if we never started it." into mnc-dev
2015-08-12 03:38:57 +00:00
Carlos Valdivia
acd8b54b77
am cbb24e24: am 332d6653: am 968fc3ab: Merge "Fix deadlock." into mnc-dev
...
* commit 'cbb24e24a3dca954ad417b0be1cd2709640ae90b':
Fix deadlock.
2015-08-12 02:03:51 +00:00
Jorim Jaggi
a4b51bc4fd
Fix Keyguard drawn timeout
...
The timeout for waiting for Keyguard drawn was posted at the wrong
place. If the screen was turning on but the device wasn't waking up,
like in doze mode, we didn't post the timeout, thus, if Keyguard
wouldn't notify us, we would never unblock the screen. This doesn't
really cause a user visible bug but it *could*
prevent the screen from turning on if Keyguard doesn't behave nicely.
Put it at the right place so I can sleep better.
Bug: 21855614
Change-Id: Icda31399261b4ee80c292ce09a0858b0127e2999
2015-08-12 01:58:12 +00:00
Carlos Valdivia
cbb24e24a3
am 332d6653: am 968fc3ab: Merge "Fix deadlock." into mnc-dev
...
* commit '332d66538ec669f60d95416ef2224c258174ed50':
Fix deadlock.
2015-08-12 01:56:34 +00:00
Carlos Valdivia
332d66538e
am 968fc3ab: Merge "Fix deadlock." into mnc-dev
...
* commit '968fc3ab75b0de71f298c6241cab1be1e6d5c86e':
Fix deadlock.
2015-08-12 01:47:11 +00:00
Carlos Valdivia
968fc3ab75
Merge "Fix deadlock." into mnc-dev
2015-08-12 01:42:19 +00:00
Julia Reynolds
bcca1fdd24
am edf02322: am b46c2a81: am 77b0d6e9: Merge "New landscape Navigation bar icons." into mnc-dev
...
* commit 'edf02322bc35fb619f3149e71ddc66737787f1f4':
New landscape Navigation bar icons.
2015-08-12 01:40:18 +00:00
Julia Reynolds
edf02322bc
am b46c2a81: am 77b0d6e9: Merge "New landscape Navigation bar icons." into mnc-dev
...
* commit 'b46c2a815b2a83b139cf2b4c9ebbb03e9f774d1d':
New landscape Navigation bar icons.
2015-08-12 01:32:25 +00:00
Julia Reynolds
b46c2a815b
am 77b0d6e9: Merge "New landscape Navigation bar icons." into mnc-dev
...
* commit '77b0d6e9f001c5e08fa367bff3b3e501ab36cc77':
New landscape Navigation bar icons.
2015-08-12 01:25:03 +00:00
Julia Reynolds
77b0d6e9f0
Merge "New landscape Navigation bar icons." into mnc-dev
2015-08-12 01:19:01 +00:00
Selim Cinek
8d97651d15
am 13c9828f: am c40d6799: Merge "Indicating fingerprint error messages on the bouncer now" into mnc-dr-dev
...
* commit '13c9828fab18571121ec3fecca99f709d606925b':
Indicating fingerprint error messages on the bouncer now
2015-08-12 01:12:59 +00:00
Selim Cinek
13c9828fab
am c40d6799: Merge "Indicating fingerprint error messages on the bouncer now" into mnc-dr-dev
...
* commit 'c40d6799df6b3dc1c61aa05d2e356096521b7099':
Indicating fingerprint error messages on the bouncer now
2015-08-12 01:06:16 +00:00
Filip Gruszczynski
d200aa4ca2
am a546e5be: am ba1e3915: am 59123b9b: Merge "When closing task stack remove reference to display content." into mnc-dev
...
* commit 'a546e5be8035d31ec7549e8a549e871a180658a9':
When closing task stack remove reference to display content.
2015-08-12 01:04:02 +00:00
Selim Cinek
c40d6799df
Merge "Indicating fingerprint error messages on the bouncer now" into mnc-dr-dev
2015-08-12 00:56:30 +00:00
Filip Gruszczynski
a546e5be80
am ba1e3915: am 59123b9b: Merge "When closing task stack remove reference to display content." into mnc-dev
...
* commit 'ba1e39153ab04631e9872a9cea746d78a87744ea':
When closing task stack remove reference to display content.
2015-08-12 00:54:33 +00:00
Dianne Hackborn
4ce98e4e3c
am e92b1374: am ea5ce408: am 15f704e7: Merge "Fix issue #23122445 : Add 420 density" into mnc-dev
...
* commit 'e92b137407f0fc00ae26947a4a6bce32633617c2':
Fix issue #23122445 : Add 420 density
2015-08-12 00:53:26 +00:00
Wale Ogunwale
0c44284432
am b3a6244c: am ceada4fd: am e43d43c3: Merge "Fixed issue with moveTaskToBack on single stack devices" into mnc-dev
...
* commit 'b3a6244c814d0e5fc6c35875352610d3290a9825':
Fixed issue with moveTaskToBack on single stack devices
2015-08-12 00:53:19 +00:00
Filip Gruszczynski
ba1e39153a
am 59123b9b: Merge "When closing task stack remove reference to display content." into mnc-dev
...
* commit '59123b9b2d7b26e7f49c77b4c62d48dc1a28518f':
When closing task stack remove reference to display content.
2015-08-12 00:49:31 +00:00
Dianne Hackborn
e92b137407
am ea5ce408: am 15f704e7: Merge "Fix issue #23122445 : Add 420 density" into mnc-dev
...
* commit 'ea5ce4080be58a8092df38a49d828e4281497dc4':
Fix issue #23122445 : Add 420 density
2015-08-12 00:44:12 +00:00
Wale Ogunwale
b3a6244c81
am ceada4fd: am e43d43c3: Merge "Fixed issue with moveTaskToBack on single stack devices" into mnc-dev
...
* commit 'ceada4fd80a7502b0057cf683661b2ea65a2652d':
Fixed issue with moveTaskToBack on single stack devices
2015-08-12 00:44:00 +00:00
Filip Gruszczynski
59123b9b2d
Merge "When closing task stack remove reference to display content." into mnc-dev
2015-08-12 00:40:50 +00:00
Dianne Hackborn
ea5ce4080b
am 15f704e7: Merge "Fix issue #23122445 : Add 420 density" into mnc-dev
...
* commit '15f704e70a0fc02f50f0b618b19147ca09c5e421':
Fix issue #23122445 : Add 420 density
2015-08-12 00:37:25 +00:00
Wale Ogunwale
ceada4fd80
am e43d43c3: Merge "Fixed issue with moveTaskToBack on single stack devices" into mnc-dev
...
* commit 'e43d43c391a5b531aead1eae0156a66a3d924fd1':
Fixed issue with moveTaskToBack on single stack devices
2015-08-12 00:37:20 +00:00
Adrian Roos
fe836fabd9
Prevent overlap of color views in landscape
...
Removes overlap from the color views which resulted in subotimal looks
when both color views were translucent and the nav bar was on the right
edge.
Also fixes a bug introduced in I2df7092a91eceeb815367ef917dd7289f4f2b27e
where the navigation-bar-on-right-side case got forgotten and caused
flickering in landscape when IMMERSIVE_STICKY was set but the navigation bar
was visible.
Bug: 22876533
Change-Id: I449a82eb3dc3f7b5051f26b37b362a196b4ff63a
2015-08-11 17:36:43 -07:00
Dianne Hackborn
15f704e70a
Merge "Fix issue #23122445 : Add 420 density" into mnc-dev
2015-08-12 00:34:56 +00:00
Wale Ogunwale
e43d43c391
Merge "Fixed issue with moveTaskToBack on single stack devices" into mnc-dev
2015-08-12 00:31:26 +00:00
Dianne Hackborn
1e9c51a00a
Fix issue #23122445 : Add 420 density
...
Change-Id: I15c113eb7e22f1d882db071c007224746f9d408f
2015-08-11 17:18:53 -07:00
Andres Morales
167d7af46b
am 5717273b: am dd7bc4ae: am 494d6e9b: [fingerprint] use credential owner in FingerprintService
...
* commit '5717273b04f9164834f6a713d6e82c3641197124':
[fingerprint] use credential owner in FingerprintService
2015-08-11 23:49:01 +00:00
Winson Chung
ae9e51343b
am 4f600aab: am ec85b522: am 8851608d: Merge "Always call onProvidersChanged() when packages containing widgets are updated." into mnc-dev
...
* commit '4f600aabe5f87203ed5b20b3788edba03ad28617':
Always call onProvidersChanged() when packages containing widgets are updated.
2015-08-11 23:48:55 +00:00
Andres Morales
5717273b04
am dd7bc4ae: am 494d6e9b: [fingerprint] use credential owner in FingerprintService
...
* commit 'dd7bc4aec916e7823ec20aa243f1d5ebc197887c':
[fingerprint] use credential owner in FingerprintService
2015-08-11 23:43:54 +00:00