Commit Graph

56574 Commits

Author SHA1 Message Date
Neil Fuller
f19a33a070 Merge "Add thread safety documentation"
am: b3ea05a56e

* commit 'b3ea05a56ea980541d328ab7534a2da230d62c06':
  Add thread safety documentation
2016-01-15 16:36:34 +00:00
Neil Fuller
69c2907c63 Merge "Fix @code escapes"
am: b0d92f4717

* commit 'b0d92f4717af4e4736dc80b2a822dae8e5a52587':
  Fix @code escapes
2016-01-15 16:31:40 +00:00
Neil Fuller
2c9d40a06e Add thread safety documentation
An upcoming change will remove "synchronized" from the API docs. This change
documents those cases where the guarantees can be determined from code
inspection.

Bug: 25767152
(cherry-picked from commit bf0dc0fba7)

Change-Id: I328b96328e89950b90d537bf0a6a704242de4993
2016-01-15 16:26:26 +00:00
Neil Fuller
9498e8a8d2 Fix @code escapes
The body of {@code} must not be HTML escaped. This is one of
several changes that fix the source in conjunction with a
doclava fix.

Bug: 25757239
(cherry-picked from commit 71fbb81b14)

Change-Id: I19dafddc6501be6fee362c396ac5bbdc934ae39d
2016-01-15 16:14:57 +00:00
Alan Viverette
c8ef3f8730 Don\'t verify the scrollbar drawable am: a53c3b2197
am: ca6b87fea6

* commit 'ca6b87fea6b16e38f8bbbd514d3cf07361a5feba':
  Don't verify the scrollbar drawable
2016-01-14 21:49:09 +00:00
Alan Viverette
ca6b87fea6 Don\'t verify the scrollbar drawable
am: a53c3b2197

* commit 'a53c3b2197b73d5b6a697ae2077e04065df84d9e':
  Don't verify the scrollbar drawable
2016-01-14 21:44:31 +00:00
Alan Viverette
a53c3b2197 Don't verify the scrollbar drawable
Avoids infinite invalidations caused by re-use of scrollbar drawable
during a single draw() pass. Does not address the general problem of
drawable reuse causing unnecessary invalidations as a result of calls
to setBounds() invoking invalidateSelf().

Bug: 26533725
Change-Id: I99e9c2dfe4ddfc833569e40e7268dcb03e931fc9
2016-01-14 21:07:13 +00:00
Chenjie Luo
af8c1b8f94 Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev am: 4a577bff96 am: d5cea64d8d
am: 7034a6e2d0

* commit '7034a6e2d05c45c437bef6150bcc70b58b3ccb3b':
  Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
2016-01-14 02:34:53 +00:00
Chenjie Luo
7034a6e2d0 Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev am: 4a577bff96
am: d5cea64d8d

* commit 'd5cea64d8d63e9ffb61af1e669962de08ea513cc':
  Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
2016-01-14 02:29:13 +00:00
Chenjie Luo
d5cea64d8d Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev
am: 4a577bff96

* commit '4a577bff9674f4bc748ab76bf48ac6e7d3e567cc':
  Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
2016-01-14 02:24:48 +00:00
Chenjie Luo
bad498f7fd Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
Bug: 25860409
Change-Id: I3f525c9c8df81807d98391c70cd2d1f8c139c8f5
2016-01-14 01:26:05 +00:00
Adam Lesinski
6a8c328d73 Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev am: d2e215978b
am: a5c7106017

* commit 'a5c71060174c5357c75592998fb095e768eca8bd':
  UsageStats: Use new settings key idle_duration2 for app idle
2016-01-14 00:59:58 +00:00
Adam Lesinski
a5c7106017 Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev
am: d2e215978b

* commit 'd2e215978be9df2f3d2bf56eb1c857c6a1bc420a':
  UsageStats: Use new settings key idle_duration2 for app idle
2016-01-14 00:54:10 +00:00
Adam Lesinski
d2e215978b Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev 2016-01-14 00:45:31 +00:00
Ian Pedowitz
105108209f Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev am: 624d43b66f
am: 0cd5e9f475

* commit '0cd5e9f475cd31535ad33a6d2151f2270bd3f29c':
  Revert "Avoid drawable invalidation during draw()"
2016-01-13 23:10:29 +00:00
Ian Pedowitz
0cd5e9f475 Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev
am: 624d43b66f

* commit '624d43b66f039e3b0f33274486512621919d96a3':
  Revert "Avoid drawable invalidation during draw()"
2016-01-13 23:01:29 +00:00
Ian Pedowitz
624d43b66f Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev 2016-01-13 22:47:45 +00:00
Alan Viverette
156bd49bdc Revert "Avoid drawable invalidation during draw()"
This reverts commit e5e59c6da4.

Drawables expect to be able to call invalidateSelf() during
draw() to pump animation frames. We shouldn't break this.

Bug: 26533725
Change-Id: Ibe2871f2622faf836637225fc1e3e6f0ca6def47
2016-01-13 21:49:10 +00:00
Adam Lesinski
f0ef3c1126 UsageStats: Use new settings key idle_duration2 for app idle
Ignores the old, re-appropriated key "idle_duration" which is now
set to a high value in order to force disable app idle on devices
with bug b/26355386

Bug:26355386
Change-Id: Iff9de843ad6e547d29c1583687fc7f7ce7e15090
2016-01-13 12:48:50 -08:00
Samuel Tan
3caecaec60 Merge "Remove PersistableBundle.aidl from Java framework"
am: 2e37bfd2d2

* commit '2e37bfd2d2f629ca50ecf0e6674484cd30560d26':
  Remove PersistableBundle.aidl from Java framework
2016-01-12 23:17:50 +00:00
Samuel Tan
239951a91e Remove PersistableBundle.aidl from Java framework
Remove PersistableBundle.aidl from the Java framework, since it
has been moved to the native libbinder.

BUG: 26292234
Change-Id: Ia3dc49a3ad92f4c579e6dff0606c1db8fb3be76b
TEST: aosp_arm builds successfully.
2016-01-12 14:43:32 -08:00
Alan Viverette
ea2e422c23 Merge "Avoid drawable invalidation during draw()" into mnc-dr1.5-dev am: cf6885b7b7
am: c783ebc13a

* commit 'c783ebc13a350f3f83dbe0713af9581e39b355ec':
  Avoid drawable invalidation during draw()
2016-01-12 20:43:33 +00:00
Alan Viverette
c783ebc13a Merge "Avoid drawable invalidation during draw()" into mnc-dr1.5-dev
am: cf6885b7b7

* commit 'cf6885b7b7665b5589c0640e1cf4b98780f3aeec':
  Avoid drawable invalidation during draw()
2016-01-12 19:22:16 +00:00
Alan Viverette
cf6885b7b7 Merge "Avoid drawable invalidation during draw()" into mnc-dr1.5-dev 2016-01-12 19:18:28 +00:00
Alan Viverette
19150f05c4 Merge "Handle null result from getVirtualChildAt()" into mnc-dr1.5-dev am: d9434699e4
am: 9c0890ea4b

* commit '9c0890ea4b2144ac3175d07a09df1dd18f0e2e22':
  Handle null result from getVirtualChildAt()
2016-01-12 19:00:26 +00:00
Alan Viverette
9c0890ea4b Merge "Handle null result from getVirtualChildAt()" into mnc-dr1.5-dev
am: d9434699e4

* commit 'd9434699e4ef8c528ce01223ee9ef200bfd693e4':
  Handle null result from getVirtualChildAt()
2016-01-12 18:53:45 +00:00
Alan Viverette
e5e59c6da4 Avoid drawable invalidation during draw()
Prevents infinite invalidation loop when reusing a drawable asset within
a single draw() call. Also reduces unnecessary extra invalidations due to
drawable setters (ex. setBounds()) being called during draw().

Bug: 26329675
Change-Id: I31b3c99e8efd4193415cc562a84c8939a2f56c2d
(cherry picked from commit 8cda8e9159)
2016-01-12 15:07:47 +00:00
Alan Viverette
ec2891b562 Handle null result from getVirtualChildAt()
Also adds final where the method was being called, adds Nullable
annotation to method, and updates docs.

Bug: 25985497
Change-Id: I847a8507f2e3970f1340cddf4abf8650dda22b35
(cherry picked from commit ad52693cf3)
2016-01-12 14:23:05 +00:00
Raph Levien
957bdc56c5 Merge changes from topic \'grapheme-dr1.5\' into mnc-dr1.5-dev am: 9f2c939730
am: 728a2fa272

* commit '728a2fa2723e6ee68853a55563fbf47aed965435':
  Respect grapheme clusters in Layout#getOffsetForHorizontal.
  Fix: Cursor can be at an invalid offset in EditText.
2016-01-12 01:20:09 +00:00
Raph Levien
243efe13a4 Merge "Fix measurement to respect grapheme and span boundaries" into mnc-dr1.5-dev am: 36c5ab3542
am: 50c22adc25

* commit '50c22adc2564fa1c31b9d0aea88707da4299d6ed':
  Fix measurement to respect grapheme and span boundaries
2016-01-12 01:17:37 +00:00
Raph Levien
728a2fa272 Merge changes from topic \'grapheme-dr1.5\' into mnc-dr1.5-dev
am: 9f2c939730

* commit '9f2c939730730e76afc46e891b82499b499503e1':
  Respect grapheme clusters in Layout#getOffsetForHorizontal.
  Fix: Cursor can be at an invalid offset in EditText.
2016-01-12 01:15:06 +00:00
Raph Levien
50c22adc25 Merge "Fix measurement to respect grapheme and span boundaries" into mnc-dr1.5-dev
am: 36c5ab3542

* commit '36c5ab3542624f9634106390fa34482babe2d8d3':
  Fix measurement to respect grapheme and span boundaries
2016-01-12 01:13:37 +00:00
Raph Levien
9f2c939730 Merge changes from topic 'grapheme-dr1.5' into mnc-dr1.5-dev
* changes:
  Respect grapheme clusters in Layout#getOffsetForHorizontal.
  Fix: Cursor can be at an invalid offset in EditText.
2016-01-12 01:10:52 +00:00
Keisuke Kuroyanagi
5bff01d72f Respect grapheme clusters in Layout#getOffsetForHorizontal.
TextUtils#getOffsetAfter was used for getting the next
offset in Layout#getOffsetForHorizontal. However, this
method doesn't treat grapheme clusters properly.
Changed to use TextLine#getOffsetToLeftRightOf instead of
TextUtils#getOffsetAfter.

Bug: 25375561
Change-Id: I96c9e6e5da65adfb5266446ecab852c52628dbb5
2016-01-11 14:32:55 -08:00
Keisuke Kuroyanagi
720edf95db Fix: Cursor can be at an invalid offset in EditText.
"getLineEnd(line) - 1" is used as the return value when the
"horiz" is beyond the line end for multiple line text.
In this case, the returned value can point an invalid
offset like the middle point of a surrogate pair.

Bug: 23069901
Change-Id: I1afef7205a15079a42bb0018df73f70fe9ada862
(cherry picked from commit 00ad16d1cd)
2016-01-11 22:29:12 +00:00
Raph Levien
909c7bca57 Fix measurement to respect grapheme and span boundaries
When measuring in TextLine (important for cursor positioning), the
substring measured must neither be too short (it can't just be the
substring up to the measure limit, but must include additional
characters if they form a ligature) nor too long (it can't extend
beyond the end of the CharacterStyle span, otherwise the measurement
fails to account for the fact that the CharacterStyle span boundary
breaks the ligature). This patch gets it just right.

Bug: 25375561
Change-Id: I36e1c4bdc66424d3b611cf54031756cf54cf3fec
2016-01-11 21:43:24 +00:00
Todd Kennedy
0271416563 Merge "Update PackageInstaller install handing"
am: 47950e588c

* commit '47950e588c59ff58d12b3429d285e3330b9dfe01':
  Update PackageInstaller install handing
2016-01-08 18:11:33 +00:00
Todd Kennedy
47950e588c Merge "Update PackageInstaller install handing" 2016-01-08 18:03:15 +00:00
Narayan Kamath
7e308606f6 Merge "Trivial correction of Camera2 API description"
am: a909dad0c3

* commit 'a909dad0c36542ffbc155f98b4eb054921b1bbd0':
  Trivial correction of Camera2 API description
2016-01-08 09:44:34 +00:00
Narayan Kamath
cd51388e01 Merge "Fixed calendar fields comparison"
am: 9aeb6edf55

* commit '9aeb6edf5518a839156de7aab808a75a8fd6843b':
  Fixed calendar fields comparison
2016-01-08 09:39:21 +00:00
Narayan Kamath
a909dad0c3 Merge "Trivial correction of Camera2 API description" 2016-01-08 09:36:14 +00:00
Philipp Hasper
81fd6b48a0 Fixed calendar fields comparison
Month was compared with the day and vice versa.
Found by dukejeffrie.

Change-Id: Ic4efca440c408325819ff1df85db7b407cf3207e
2016-01-08 09:29:39 +00:00
Hidenari Koshimae
0fa4914484 Trivial correction of Camera2 API description
Change-Id: Ibb3393b94812dfe7b496182bb5ef43f1a5df7434
2016-01-08 16:18:59 +09:00
Todd Kennedy
819d2745b4 Update PackageInstaller install handing
* Allow forcing permission check. We want to modify the PackageInstaller to
use the PackageInstallerSession for better security / remove deprecated APIs.
In order to do this and continue to prompt for permissions, we need to prevent
the PakcageInstaller from auto-approving the permissions.

* Add originating UID to SessionParams. This is used for package verifier
checks.

Bug: 22282121
Change-Id: I19079749d20ace66f1332f399d52cb0fb8784cd9
2016-01-07 13:51:16 -08:00
Alex Klyubin
4a06b7ea7e Merge "[1/3] Remove unnecessary throws statement in ServiceManager"
am: d1240219aa

* commit 'd1240219aadedc867b50158c67d1737a27fa7c6f':
  [1/3] Remove unnecessary throws statement in ServiceManager
2016-01-07 19:18:01 +00:00
Alex Klyubin
d1240219aa Merge "[1/3] Remove unnecessary throws statement in ServiceManager" 2016-01-07 19:08:26 +00:00
Calin Juravle
435ad029a3 Merge "Create jit profile file during the app startup flow."
am: 5fac913d98

* commit '5fac913d98eb44269b53cd9cc6a011a4eef3c98d':
  Create jit profile file during the app startup flow.
2016-01-07 11:52:50 +00:00
Calin Juravle
5fac913d98 Merge "Create jit profile file during the app startup flow." 2016-01-07 11:44:55 +00:00
Calin Juravle
690523969d Create jit profile file during the app startup flow.
ActivityThread has already all the needed information
(userId,sharedAppId) to create the profile file and set the correct
permissions on it. This avoids passing uids to the runtime which now
expects the profile file to be already created.

As part of this change:
- move the registration with the runtim in handleBindApplication
- register only if needed: we could properly setup a profile file and we
have at least one code path. Note that registration with the runtime is
done solely for profiling reasons.

Bug: 26080105
Change-Id: I72657e9ea0a0449a09734456b5f8b5da844cee62
2016-01-07 11:29:38 +00:00
Umair Khan
9ccebbfc37 [1/3] Remove unnecessary throws statement in ServiceManager
The exception is already caught by the try-catch block.

Change-Id: I0c10fe51d12a10cbc02a25c719d03a4ba6497767
Signed-off-by: Umair Khan <omerjerk@gmail.com>
2016-01-07 15:08:27 +05:30