Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
164,750 Commits 3 Branches 0 Tags
d98e7c1df774eb86a67310f5cbc0dbdd91f33c19
Commit Graph

164750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rubin Xu
d7892e71a8 Fix equality test in getProfileOwnerAdmin() 
The equality test should compare a ComponentName, which admin.info is not.

Bug: 18186447
Change-Id: If984ae2e0da958889564ba30716d65245a78d60f
 2014-10-30 17:57:23 +00:00
Hyejin Kim
5baaaac7c7 Fix not to show a log with empty default ime 
It'll make reboot to show a log with empty defualt ime.

Bug: 18165757
Change-Id: I7a0d55bc0da0566a60abb24123c1dbcdd03be9ed
 2014-10-30 17:49:54 +00:00
Alan Viverette
e9e7d012dd am 272e2f73: Merge "Ensure we don\'t pass null values in to Theme.resolveAttributes" into lmp-mr1-dev 
* commit '272e2f73bd825aa6b1db0a5b332effe8b84d7b8c':
  Ensure we don't pass null values in to Theme.resolveAttributes
 2014-10-30 17:43:27 +00:00
John Spurlock
734666657f Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS. 
Bug: 18186862
Change-Id: I685934118a53ba2135eaf0872564e58069de2a30
 2014-10-30 13:42:05 -04:00
Alan Viverette
272e2f73bd Merge "Ensure we don't pass null values in to Theme.resolveAttributes" into lmp-mr1-dev 2014-10-30 17:38:40 +00:00
Alan Viverette
7f4a63d1eb Ensure we don't pass null values in to Theme.resolveAttributes 
BUG: 18182274
Change-Id: I08acf877cb81478cc205254edf92a31fcf05991d
 2014-10-30 10:29:03 -07:00
Ricardo Cervera
44e79cc59a am e0a3bcfb: am 0db81996: am e0acf536: am e3dd89a4: Merge "docs: Two-page notification fix." into lmp-docs 
* commit 'e0a3bcfbe1637db8584b176a67447f152716036f':
  docs: Two-page notification fix.
 2014-10-30 15:50:31 +00:00
Ricardo Cervera
e0a3bcfbe1 am 0db81996: am e0acf536: am e3dd89a4: Merge "docs: Two-page notification fix." into lmp-docs 
* commit '0db8199664e9f501c4b2d1f8e404d762f68ae684':
  docs: Two-page notification fix.
 2014-10-30 15:44:55 +00:00
Ricardo Cervera
0db8199664 am e0acf536: am e3dd89a4: Merge "docs: Two-page notification fix." into lmp-docs 
* commit 'e0acf536a00cc30ab8420e43321096afba601024':
  docs: Two-page notification fix.
 2014-10-30 15:38:35 +00:00
Ricardo Cervera
e0acf536a0 am e3dd89a4: Merge "docs: Two-page notification fix." into lmp-docs 
* commit 'e3dd89a42a48c9ba461a0fff7859b7d0b205d146':
  docs: Two-page notification fix.
 2014-10-30 15:34:37 +00:00
Ricardo Cervera
e3dd89a42a Merge "docs: Two-page notification fix." into lmp-docs 2014-10-30 15:27:32 +00:00
Jorim Jaggi
196edbc9f6 am cdbdbe3a: Merge "Make status bar expanding more tightly coupled to finger" into lmp-mr1-dev 
* commit 'cdbdbe3a54f46cbe885fb2bb27d5e79297730bf0':
  Make status bar expanding more tightly coupled to finger
 2014-10-30 14:58:05 +00:00
Sander Alewijnse
112e053b9a Change javadoc of setAccountManagementDisabled. 
Method can also be called by device owner.

Bug:18166033
Change-Id: I38ab17bdfe9f0c4b33f5257d2f335afe16e84031
 2014-10-30 14:54:28 +00:00
Jorim Jaggi
cdbdbe3a54 Merge "Make status bar expanding more tightly coupled to finger" into lmp-mr1-dev 2014-10-30 14:51:45 +00:00
Jorim Jaggi
0b1528aac4 Make status bar expanding more tightly coupled to finger 
Improves the "direct modification" feeling a bit.

Bug: 17040206
Change-Id: Ide4bfb36aef584da36e0340bc2ed099e2e24c0ee
 2014-10-30 15:35:38 +01:00
Jorim Jaggi
37651a8baa am 2905cafc: Merge "Follow up to I495ce480c25de24b6433adebdfe923b637d98f66" into lmp-mr1-dev 
* commit '2905cafcb898bccb1f52e77f3c2f7eb5fc9fe01f':
  Follow up to I495ce480c25de24b6433adebdfe923b637d98f66
 2014-10-30 14:30:58 +00:00
Jorim Jaggi
2905cafcb8 Merge "Follow up to I495ce480c25de24b6433adebdfe923b637d98f66" into lmp-mr1-dev 2014-10-30 14:25:51 +00:00
Lorenzo Colitti
1a9864db0a am 2d2a69b2: Merge "Enable 464xlat on wifi." into lmp-mr1-dev 
* commit '2d2a69b2d3c03daa167fa1daba590a42dd3c3002':
  Enable 464xlat on wifi.
 2014-10-30 13:33:59 +00:00
Lorenzo Colitti
f2c9094293 am bbb2c5b2: Merge "Add support for running 464xlat on wifi as well." into lmp-mr1-dev 
* commit 'bbb2c5b28ad153afef40e27efbb8241988f33583':
  Add support for running 464xlat on wifi as well.
 2014-10-30 13:33:55 +00:00
Lorenzo Colitti
2d2a69b2d3 Merge "Enable 464xlat on wifi." into lmp-mr1-dev 2014-10-30 13:28:03 +00:00
Lorenzo Colitti
bbb2c5b28a Merge "Add support for running 464xlat on wifi as well." into lmp-mr1-dev 2014-10-30 13:27:54 +00:00
Lorenzo Colitti
dc6690867b Enable 464xlat on wifi. 
Bug: 12111730
Change-Id: If6d118a3c6e163262b09cc2fb3e3d3f9a81986ec
 2014-10-30 20:31:27 +09:00
Lorenzo Colitti
e21a26b3ba Add support for running 464xlat on wifi as well. 
1. Add a command to NetworkManagementService to enable/disable
   IPv6 ND offload via netd.
2. Make Nat464Xlat enable offload if clatd successfully comes up
   on a wifi network (which means it detected a NAT64), and
   correspondingly re-enable offload when the clatd interface
   goes down.

This change does not enable clatd on wifi yet, that requires an
extra 2 lines to enable it.

Bug: 12111730
Change-Id: I4318611762a37487c9a84f8c4867ec5aece98be8
 2014-10-30 20:31:26 +09:00
Nicolas Prevot
3a1a0bbc32 Add a cross-profile intent filter only if it wasn't previously added. 
BUG: 17996284
Change-Id: I3d087767983928dfb13af9aedb37d29c9940ba36
 2014-10-30 11:02:37 +00:00
Nicolas Prevot
ad93adfb3d am 9710b04f: Merge "Schedule to write package restrictions." into lmp-mr1-dev 
* commit '9710b04f35efae696c9ee6343671eff3568f5678':
  Schedule to write package restrictions.
 2014-10-30 10:31:47 +00:00
Nicolas Prevot
9710b04f35 Merge "Schedule to write package restrictions." into lmp-mr1-dev 2014-10-30 10:28:20 +00:00
Chris Banes
95e3322c93 am e436cb39: Merge "Fix ActionMenuView vertical alignment of items" into lmp-mr1-dev 
* commit 'e436cb39da5ebd57b0ca072ba39bfbe52b0a75e7':
  Fix ActionMenuView vertical alignment of items
 2014-10-30 08:58:41 +00:00
Chris Banes
e436cb39da Merge "Fix ActionMenuView vertical alignment of items" into lmp-mr1-dev 2014-10-30 08:42:37 +00:00
kmccormick
5298190a30 am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs 
automerge: 3e92c4a

* commit '3e92c4a20f413a800c168ee8ff7fe3b687f234a7':
  Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-30 05:23:58 +00:00
Dongwon Kang
c78d450b2e TIF: handle inputs holding the overlay view even after the session release 
automerge: ce34c6d

* commit 'ce34c6d308629c214ab9b7963755eb60cac03c9d':
  TIF: handle inputs holding the overlay view even after the session release
 2014-10-30 05:15:22 +00:00
Dongwon Kang
39567dd648 am c1f26faa: Merge "TIF: Handle notifyXXX() calls requested before the session initialization" into lmp-mr1-dev 
* commit 'c1f26faa2db2062ed42e422b038442fdb0aa3c68':
  TIF: Handle notifyXXX() calls requested before the session initialization
 2014-10-30 04:42:39 +00:00
Dongwon Kang
ce34c6d308 TIF: handle inputs holding the overlay view even after the session release 
Bug: 17336221
Change-Id: I7fb7890039bc3731b62410caa9802db5870ec2e2
 2014-10-30 13:37:03 +09:00
Dongwon Kang
c1f26faa2d Merge "TIF: Handle notifyXXX() calls requested before the session initialization" into lmp-mr1-dev 2014-10-30 04:32:30 +00:00
Yohei Yukawa
095fa37164 Conditionally allow non-primay profiles to use TextServices 
With this CL, non-primary profiles become able to use
TextServices (spelling correction services) if and only if
the active spell checker service is the system's one.

Basically this CL just copies the same logic from
InputMethodManagerService that were implemented as
I3bd87b32aec69c3f8d and Id5d4f29017b7ca6844632 with adding
a condition to see if the spell checker is system's one
or not.

Note that this is a tentative solution and can be removed
once TSMS fully supports multiuser.

Also note that this CL heavily relies on the fact that
setting apps isonly running in the current user. This is
because that some risky operations that are exposed from
TSMS are non-public APIs an accessible only from @hide
methods in TextServicesManager, and those @hide methods
are actually used only by the settings app so far.

BUG: 16285536
Change-Id: Iae9045ba5baccd04ed68906e7afb9160677ec4a5
 2014-10-30 03:16:59 +00:00
Yigit Boyar
012e06bcb9 am 33d9dc46: Merge "Move all actionbar related methods to DecorToolbar" into lmp-mr1-dev 
* commit '33d9dc46cfbe42e508b2c4b97801059964b3476b':
  Move all actionbar related methods to DecorToolbar
 2014-10-30 02:18:38 +00:00
Yigit Boyar
33d9dc46cf Merge "Move all actionbar related methods to DecorToolbar" into lmp-mr1-dev 2014-10-30 02:02:15 +00:00
Alan Viverette
ce0bc26443 am a9ba2cdf: Merge "Ensure ImageView.setImageResource() always resolves Drawable" into lmp-mr1-dev 
* commit 'a9ba2cdfc10f8bdeee2bd8fb95432df873003f44':
  Ensure ImageView.setImageResource() always resolves Drawable
 2014-10-30 00:57:06 +00:00
Alan Viverette
a9ba2cdfc1 Merge "Ensure ImageView.setImageResource() always resolves Drawable" into lmp-mr1-dev 2014-10-30 00:52:17 +00:00
Alan Viverette
3c5cc234ee am 674a3a21: Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev 
* commit '674a3a21cba94c129b322b05bbaaf9b1fc8afbd8':
  Distinguish unspecified and explicit null values in resources
 2014-10-30 00:45:56 +00:00
Alan Viverette
674a3a21cb Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev 2014-10-30 00:41:44 +00:00
Dongwon Kang
3eefa59e37 TIF: Handle notifyXXX() calls requested before the session initialization 
Previously, we relied on a handler by posting runnables when the
session is not initialized yet. However, this trick was broken when we
separated the creation procedure into DO_CREATE_SESSION and
DO_NOTIFY_SESSION_CREATED.

Bug: 17909798
Change-Id: I46f610cb9673f8162266525ac0e343b61c6db9ec
 2014-10-30 09:34:56 +09:00
Alan Viverette
07a08010a8 am 425b1dc8: Merge "Add theme and config change support to more Drawable types" into lmp-mr1-dev 
* commit '425b1dc88c47e0e9d3a653ad902a69f3ec09b966':
  Add theme and config change support to more Drawable types
 2014-10-30 00:30:11 +00:00
Alan Viverette
d739d7bd8a Ensure ImageView.setImageResource() always resolves Drawable 
Fixes no-op on method call after configuration change at the expense
of removing a micro-optimization that wasn't really needed.

BUG: 18178233
Change-Id: I36eccf91b138e4bed34be96d9b87200edeb66938
 2014-10-29 17:26:37 -07:00
Alan Viverette
425b1dc88c Merge "Add theme and config change support to more Drawable types" into lmp-mr1-dev 2014-10-30 00:24:28 +00:00
Alan Viverette
65d792e46c am 10450405: Merge "Show scroll indicators in AlertDialog" into lmp-mr1-dev 
* commit '104504053d33d337d52350960c48a1edc5ba1444':
  Show scroll indicators in AlertDialog
 2014-10-30 00:22:05 +00:00
Alan Viverette
104504053d Merge "Show scroll indicators in AlertDialog" into lmp-mr1-dev 2014-10-30 00:18:32 +00:00
Alan Viverette
154c2c24dc Show scroll indicators in AlertDialog 
BUG: 16353356
Change-Id: I0307283751ccb23b9d85b0c36cb78b01243e70dd
 2014-10-30 00:18:22 +00:00
Alan Viverette
f296940502 Distinguish unspecified and explicit null values in resources 
BUG: 17919345
Change-Id: Ic4f04f7dd0f986f58a749b5950d80c1cfdb074ea
 2014-10-29 17:09:36 -07:00
kmccormick
30c27afcc7 am f769c981: am 4d9872e6: am 1649712f: am 13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes. 
* commit 'f769c98172186a8767d309492b6179b5de0d11cd':
  DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-29 23:58:44 +00:00
kmccormick
d61ce7db43 am 20dfe399: am 63ee1976: am 2b20b9d2: am 3e92c4a2: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs 
* commit '20dfe399a68a6542f1787546da01a41a92ca3ab3':
  Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-29 23:58:38 +00:00