Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
199,870 Commits 3 Branches 0 Tags
d913d78a331de5e488b27810d8dd18399f50de48
Commit Graph

199870 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
d913d78a33 am ea68c4ce: am c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev 
* commit 'ea68c4ceacbe235c4d8688437010d855ef02e1fb':
  Update ifaces when global restriction changes.
 2015-08-13 00:11:49 +00:00
Jeff Sharkey
ea68c4ceac am c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev 
* commit 'c97509c0292910d7fb27e4c890ad4bc0ea723fec':
  Update ifaces when global restriction changes.
 2015-08-13 00:00:13 +00:00
Jeff Sharkey
c97509c029 Merge "Update ifaces when global restriction changes." into mnc-dev 2015-08-12 23:51:55 +00:00
Jeff Sharkey
9d14206594 Update ifaces when global restriction changes. 
Global restriction of background data only applies to metered
interfaces, but battery saver applies to all interfaces.  In the
very specific case where global background had been turned on while
battery saver was enabled, we'd end up with a stale battery saver
rule floating around.

This change triggers an update of iface rules when the global
restriction changes, giving us consistent behavior.

Bug: 23098198
Change-Id: I454dc71cf11d50a2e9e6122e8a801ff17039b43a
 2015-08-12 16:46:05 -07:00
Roshan Pius
289ecbbfaf am 737aed41: Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev 
* commit '737aed41ca9d8bad425ed8223fa4e4c84c7b102c':
  Add a new carrier config for DTMF tone gap.
 2015-08-12 23:17:27 +00:00
Roshan Pius
737aed41ca Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev 2015-08-12 23:12:24 +00:00
Raph Levien
855a862f6d am c98a786c: am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev 
* commit 'c98a786c693bf0bb617348e858ffe720db4d96d8':
  Fix Insertion ActionMode not showing on RTL languages
 2015-08-12 21:13:32 +00:00
Raph Levien
c98a786c69 am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev 
* commit 'beabcb92cbdec6f68bd712c9972e6f8377b78f46':
  Fix Insertion ActionMode not showing on RTL languages
 2015-08-12 21:07:43 +00:00
Roshan Pius
9f81ce727c Add a new carrier config for DTMF tone gap. 
Adding a new carrier config key to specify the gap between the DTMF
tones sent out to the network.

BUG: 23064351
Change-Id: I3a0e20efecd62f533e796a40097f181d4c20d614
 2015-08-12 21:04:26 +00:00
Raph Levien
beabcb92cb Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev 2015-08-12 21:00:07 +00:00
Eino-Ville Talvala
6986410a59 am 5679800f: am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev 
* commit '5679800f382918bb3ca159997609fc551f2a739a':
  Camera: Fix framework bugs with DEPTH-only camera devices
 2015-08-12 20:32:53 +00:00
Eino-Ville Talvala
5679800f38 am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev 
* commit '242ff8a89d851cc5c53b11dadd871fa55e00fbb5':
  Camera: Fix framework bugs with DEPTH-only camera devices
 2015-08-12 20:18:46 +00:00
Clara Bayarri
f95ed10d9d Fix Insertion ActionMode not showing on RTL languages 
When long pressing on an empty Text field with the system language set
to RTL, the "paste" popup was not showing up.

The Floating Toolbar requires a content rect to determine where the
text is and place itself close to it. In the case of an empty field,
we create a "fake" content rect by taking the placement of the cursor
+1 pixel to the right. In RTL languages, this +1 causes the content
rect to be considered off the bounds of the view, as the cursor is
aligned to the right, and hence the Floating Toolbar is hidden.

After making the rect a 0 width rect, we ran into the issue that
it was considered out of bounds due to the calculation ignoring rects
that simply touch the edge of the view's bounds.

BUG: 22540083
Change-Id: I29c79b701f586970b2611178233eff082b802ec1
 2015-08-12 21:03:28 +01:00
Eino-Ville Talvala
242ff8a89d Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev 2015-08-12 20:01:44 +00:00
Mike Dodd
79fdfecb94 am 954ca10e: am ad285c16: Merge "Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."" into mnc-dev 
* commit '954ca10eeee254c923a53e0632d1ec84c10aee8b':
  Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."
 2015-08-12 19:06:13 +00:00
Mike Dodd
954ca10eee am ad285c16: Merge "Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."" into mnc-dev 
* commit 'ad285c169fd55bee8feef6e076a6710c357043e5':
  Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."
 2015-08-12 18:59:05 +00:00
Mike Dodd
ad285c169f Merge "Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."" into mnc-dev 2015-08-12 18:53:48 +00:00
Mike Dodd
719192c946 Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)." 
This reverts commit 3a24898f55.

Change-Id: I86de9a7fe9f72748c7ac33d9df7fd1fbd8007f7c
 2015-08-12 18:48:31 +00:00
Adrian Roos
afdfc2c04d am 192ca56d: am c0a4883d: Merge "Prevent overlap of color views in landscape" into mnc-dev 
* commit '192ca56d7a0c8a1a776bd8f9539c49f4b8ce3372':
  Prevent overlap of color views in landscape
 2015-08-12 18:26:49 +00:00
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
Jason Monk
36ea805f1e am 670b8b59: am 0c762957: Merge "Fix tuner for secondary users" into mnc-dev 
* commit '670b8b597131c35cbd742d94ee1d22ace5d06e51':
  Fix tuner for secondary users
 2015-08-12 18:09:24 +00:00
Geoff Mendal
b689d776bb am 9e47ba6e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '9e47ba6e06ad382361f166f26f4da5268f11f4aa':
  Import translations. DO NOT MERGE
 2015-08-12 18:09:21 +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
6379ddbe5a am 3f5d76dd: am 7f2f96cc: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev 
* commit '3f5d76dd5ee4e73d69a6e6ce0d5f5c70c05f789f':
  Set default SMS/MMS app to com.android.messaging (new AOSP app).
 2015-08-12 17:51:17 +00:00
Todd Kennedy
d43f4d924b am 8af3406a: am 24e4d48f: Merge "Promote system app permissions" into mnc-dev 
* commit '8af3406a4558e81394ac18ea0d0dcd728833f483':
  Promote system app permissions
 2015-08-12 17:51:14 +00:00
Michael Wright
d3b7314ee2 am d9c906e7: am e20493ea: Merge "Log last filtered sensor timestamp." into mnc-dev 
* commit 'd9c906e73160afef63fb1db66b5482f483ea05e0':
  Log last filtered sensor timestamp.
 2015-08-12 17:51:09 +00: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
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
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
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
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