Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
198,993 Commits 3 Branches 0 Tags
192ca56d7a0c8a1a776bd8f9539c49f4b8ce3372
Commit Graph

198993 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Roos
192ca56d7a am c0a4883d: Merge "Prevent overlap of color views in landscape" into mnc-dev 
* commit 'c0a4883d58554c84d10911da20f43be149b47c53':
  Prevent overlap of color views in landscape
 2015-08-12 18:16:32 +00:00
Adrian Roos
c0a4883d58 Merge "Prevent overlap of color views in landscape" into mnc-dev 2015-08-12 18:06:42 +00:00
Jason Monk
670b8b5971 am 0c762957: Merge "Fix tuner for secondary users" into mnc-dev 
* commit '0c7629579184f85d36a4854e7c6f5b81f5b7299e':
  Fix tuner for secondary users
 2015-08-12 18:06:18 +00:00
Geoff Mendal
9e47ba6e06 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-08-12 18:03:39 +00:00
Jason Monk
0c76295791 Merge "Fix tuner for secondary users" into mnc-dev 2015-08-12 17:59:22 +00:00
Geoff Mendal
f23b2966e1 Import translations. DO NOT MERGE 
Change-Id: I4fc5ccb494ee7b446489bcee8ecd733790c92779
Auto-generated-cl: translation import
 2015-08-12 10:51:55 -07:00
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
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
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
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
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
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
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
c40d6799df Merge "Indicating fingerprint error messages on the bouncer now" into mnc-dr-dev 2015-08-12 00:56:30 +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
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
Selim Cinek
cfafe4ea6f Indicating fingerprint error messages on the bouncer now 
Also ensure that error messages are surfaced when the screen
comes on such that the user knows why his fingerprint is not
working.

Bug: 22035466
Bug: 22524101
Change-Id: I00b0e833cdb8a3475545ba75b8cb7bf7a419dfd4
 2015-08-11 16:37:54 -07:00
Andres Morales
dd7bc4aec9 am 494d6e9b: [fingerprint] use credential owner in FingerprintService 
* commit '494d6e9b030e757cef996bcbfd68a80a7d1526e7':
  [fingerprint] use credential owner in FingerprintService
 2015-08-11 23:36:03 +00:00
Winson Chung
ec85b52232 am 8851608d: Merge "Always call onProvidersChanged() when packages containing widgets are updated." into mnc-dev 
* commit '8851608de30c1ebba80eb2de0e98795165e543dd':
  Always call onProvidersChanged() when packages containing widgets are updated.
 2015-08-11 23:15:51 +00:00
Andres Morales
494d6e9b03 [fingerprint] use credential owner in FingerprintService 
Bug: 23027554
Change-Id: I185492b5008058fdb23a4536a8a73177ee4903d8
 2015-08-11 23:14:34 +00:00
Winson Chung
8851608de3 Merge "Always call onProvidersChanged() when packages containing widgets are updated." into mnc-dev 2015-08-11 22:53:51 +00:00
Jorim Jaggi
959431bcca Wake device when Keyguard invisible and getting fingerprint 
Also fixes a bug where we didn't listen for fingerprint after
rebooting the device.

Bug: 22644634
Bug: 23046263
Change-Id: Ide85a01d9d4cfcc880fbc29ca4f3cc6eef47da2d
 2015-08-11 22:35:50 +00:00
Chris Manton
5ace41f50b am 19aa341a: Merge "Save data registration roaming state" into mnc-dev 
* commit '19aa341a3548c454c12378d7c4d92cc5074685a8':
  Save data registration roaming state
 2015-08-11 22:28:55 +00:00
Chris Manton
19aa341a35 Merge "Save data registration roaming state" into mnc-dev 2015-08-11 22:19:39 +00:00
Carlos Valdivia
a3721e1cc8 Fix deadlock. 
AccountManagerService can't ever synchronize on mUsers within a block of
code locked by UserAccounts.cacheLock. That will lead to deadlocks.

This change fixes a case where we were doing that in
getAccountsInternal(). Also I have purgeOldGrantsAll() run off the the
main thread.

Bug: 23036400
Change-Id: I8634691ca54c57a6e83633baba549226fdcd1064
 2015-08-11 15:12:22 -07:00
Winson
dbba74e81f Always call onProvidersChanged() when packages containing widgets are updated. 
- In the existing logic, the call to onProvidersChanged() is called when a package
  with widgets is added or removed, but only called when a package is updated _and_
  there is an app widget bound to a host.  This differs from what the expected
  behavior is based on the documentation and means that packages with widgets that
  update have no way of notifying host apps of changes except via package events.

Bug: 20698931
Change-Id: I60af36d51e99ca1ea751d9d9d03a50ef2d5bef98
 2015-08-11 14:29:13 -07:00
Wale Ogunwale
4270924801 Fixed issue with moveTaskToBack on single stack devices 
Icdad980eec64e081d15679600da07cf4431e40d6 allowed us to
properly return to the home acitvity when a task is moved
to back. However, this improperly moved the home task to
the front if it is the task we are moving to the back on
a single stack device. We now prevent the movement of the
home task to the front from happening.

Bug: 23088310
Change-Id: Ic21779cdb2d2007671d212d41fab5e68be2ae632
 2015-08-11 13:54:42 -07:00
Diego Perez
af8c19e770 am 7d85b543: Merge "Make DelegateManager thread safe" into mnc-dev 
* commit '7d85b5435d01f8d4856a718d655e30fb5a703560':
  Make DelegateManager thread safe
 2015-08-11 20:49:51 +00:00
Diego Perez
7d85b5435d Merge "Make DelegateManager thread safe" into mnc-dev 2015-08-11 20:44:40 +00:00
Mike Dodd
3a24898f55 Set default SMS/MMS app to com.android.messaging (new AOSP app). 
b/23110861

Change-Id: I5ac753264222cb617027cf13527178a7e754a80b
 2015-08-11 13:14:53 -07:00
Alan Viverette
bb03bf0554 am 105febd2: Merge "Don\'t re-wrap alert dialog context" into mnc-dev 
* commit '105febd2cfb4760926ed0aef3c24be3727dd36e4':
  Don't re-wrap alert dialog context
 2015-08-11 19:41:40 +00:00
Alan Viverette
bfd62580df am 11104791: Merge "Ensure ripple mask is drawn at correct position" into mnc-dev 
* commit '11104791c71e0140f1d37b711ca929939a85b77c':
  Ensure ripple mask is drawn at correct position
 2015-08-11 19:41:35 +00:00
Alan Viverette
105febd2cf Merge "Don't re-wrap alert dialog context" into mnc-dev 2015-08-11 19:34:27 +00:00