drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
160,219 Commits 1 Branch 0 Tags
Commit Graph

59723 Commits

Author SHA1 Message Date
Andre Eisenbach
813ac73e34 am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev 
* commit '455502b7501bdbc55a739083878431c3ba7ef81a':
  Add API to check if a Bluetooth connection is encrypted (1/2)
 2015-02-10 00:26:58 +00:00
Andre Eisenbach
455502b750 Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev 2015-02-10 00:21:43 +00:00
Matthew Xie
a40e0699df am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev 
* commit 'a63ba4287e5c87f41cd7d4b43111fd18f3ec499b':
  Separate the protection of mProxyServiceStateCallbacks from that of mService
 2015-02-09 21:58:26 +00:00
Matthew Xie
a63ba4287e Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev 2015-02-09 21:50:58 +00:00
Amith Yamasani
d085a7bb64 am 61333d1b: Merge "Limit cache update to packages that have changed" into lmp-mr1-dev 
* commit '61333d1b51ae36c9e5b1f4ea95bd00731c5e991a':
  Limit cache update to packages that have changed
 2015-02-09 20:04:43 +00:00
Amith Yamasani
61333d1b51 Merge "Limit cache update to packages that have changed" into lmp-mr1-dev 2015-02-09 19:59:27 +00:00
Andre Eisenbach
2b8696e3a9 Add API to check if a Bluetooth connection is encrypted (1/2) 
Bug: 19186961
Change-Id: I24656a07ee23ebfe067a9dfb9c1bc4041c782d8c
 2015-02-09 11:31:06 -08:00
Amith Yamasani
460a7b4619 Limit cache update to packages that have changed 
When updating the RegisteredServicesCache, don't remove any packages
that are not in the list of modified packages.

Bug: 19228972
Change-Id: Id4f264403b7ceca9005854dfbbc25abfd7b54889
 2015-02-09 11:10:31 -08:00
Zhijun He
3c75d2615d am 07c745b5: Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev 
* commit '07c745b525d39309a9ea93605fb5f85c295502f1':
  camera-metadata: clarify the AE precapture trigger spec
 2015-02-09 16:54:06 +00:00
Zhijun He
07c745b525 Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev 2015-02-08 17:38:03 +00:00
Zhijun He
dd72be5971 camera-metadata: clarify the AE precapture trigger spec 
Doc only change.

Bug: 19301706
Change-Id: I8f94ee5ace6dd3040ee2f350d589e24e53694f1b
 2015-02-06 17:51:34 -08:00
Matthew Xie
60675b2273 Separate the protection of mProxyServiceStateCallbacks from that of mService 
The overuse of mManagerCallback caused a deaklock.
Bug: 19264190

Change-Id: Iff20019ff0c99bb5f36435feb15e43e280a8e102
 2015-02-06 14:13:56 -08:00
Svet Ganov
f08036f769 am 34123f1c: Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev 
* commit '34123f1ce83e39a5a6045b1a90a148cd4c514e7e':
  Accessibility: ignore children of a view with node provider.
 2015-02-06 21:50:55 +00:00
Svet Ganov
a1b14e371a am 060bca74: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev 
* commit '060bca7444b8bf34fa95a6a71daf72fa8a85d78e':
  Accessibility: Handle a missed case when clicking focused views.
 2015-02-06 21:50:51 +00:00
Svet Ganov
34123f1ce8 Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev 2015-02-06 21:49:02 +00:00
Svet Ganov
060bca7444 Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev 2015-02-06 21:46:25 +00:00
Svet Ganov
55bdb10c16 Accessibility: ignore children of a view with node provider. 
A view that has an accessibility node provider should not have real children
since the provider is responsible to generate the node infos for the subtree
rooted at its hosting view. This is how the APIs are designed to work. However,
it is a common mistake and if this occurs the accessibility services
introspecting the screen get into an infinite loop.

The framework now does not add the real children of a view with a node provider
to the list of accessibility children. If the developer wants them exposed they
have to do that via the provider APIs as per contract.

bug:19297093

Change-Id: I1b01b1e4a85e1c397886fcd2506b434beb063687
 2015-02-06 12:41:21 -08:00
Svet Ganov
0a2cceebd5 Accessibility: Handle a missed case when clicking focused views. 
The clicking logic was missing the case where a child of the accessibility
focused view reacts to the injected down up events for clicking. This
results of a whole class of views being non-interactive. Now if an event
is targeting accessibility focus and the dispatching view group has this
focus, we clear the flag before dispatching to children, so they can
handle the event rather ignoring it becuase they are not accessibility
focused.

bug:19252492

Change-Id: I6ac25bb7a50b35bb638ca4bfb9fc4198d08c2d4d
 2015-02-06 10:23:33 -08:00
Neil Fuller
d6d8eb39b6 am f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev 
* commit 'f789d45b24acc3745ccc97adb687502d488404f6':
  Avoid static initialization of Layout from TextUtils
 2015-02-06 17:37:15 +00:00
Neil Fuller
f789d45b24 Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev 2015-02-06 17:30:47 +00:00
Kenny Guy
81918ce00b am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev 
* commit '8debf21357477083a716275e2a32cb7169d42c47':
  Fix mangled javadoc for setPermittedInputMethods.
 2015-02-06 15:30:42 +00:00
Kenny Guy
8debf21357 Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev 2015-02-06 15:22:23 +00:00
Neil Fuller
d29bdb266d Avoid static initialization of Layout from TextUtils 
This works around a bug in standalone (e.g. non-Zygote)
runtimes when a device is attached to a host that is running
DDM.

There is a race condition:

When the runtime receives a HELLO from DDM it calls
TextUtils.isEmpty().

Calling any TextUtils methods statically initializes
Layout. Layout has dependencies on other classes, which in
turn have dependencies on native methods that are not always
registered when the call takes place. Registration and DDM
handling are done in separate threads.

This is not a fix, merely a workaround until the race can
be resolved.

Bug: 18081539
Change-Id: If1bd3de6597bc93da381c8f86dacf40156449561
 2015-02-06 10:29:54 +00:00
Alan Viverette
dc31e4f07b am 9a166c7d: Merge "Mutate scroll bar drawables" into lmp-mr1-dev 
* commit '9a166c7da3d77c4b9801dbe249f78149649d5b0e':
  Mutate scroll bar drawables
 2015-02-06 00:25:07 +00:00
Alan Viverette
9a166c7da3 Merge "Mutate scroll bar drawables" into lmp-mr1-dev 2015-02-06 00:19:44 +00:00
Alan Viverette
f8512ce081 Mutate scroll bar drawables 
Bug: 19285726
Change-Id: I4bb596433c1fa1cc4e2fa53d0cdae992f9add858
 2015-02-05 15:58:56 -08:00
Alan Viverette
5bebf6c56f am 69a62a8b: Merge "Update preference dialog padding to Material" into lmp-mr1-dev 
* commit '69a62a8b0df71b0a26d55c29c71dd311dbe174c7':
  Update preference dialog padding to Material
 2015-02-05 22:11:37 +00:00
Alan Viverette
69a62a8b0d Merge "Update preference dialog padding to Material" into lmp-mr1-dev 2015-02-05 22:06:36 +00:00
John Spurlock
47baf09cb7 am 9adf1c54: am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few typos in Parcel.java. 
* commit '9adf1c54226940e9f9065d92b4edd2b232122302':
  Fix a few typos in Parcel.java.
 2015-02-05 20:47:10 +00:00
John Spurlock
9adf1c5422 am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few typos in Parcel.java. 
* commit 'ac7b9dd39f64118a2129c17cdc7b6c93e53e1c42':
  Fix a few typos in Parcel.java.
 2015-02-05 20:39:36 +00:00
Alan Viverette
2fb5a6ab9f Update preference dialog padding to Material 
Mostly copy/paste of the Holo with some padding fiddling to make the
EditText, which has baked-in padding, and TextView line up.

Bug: 19280124
Change-Id: I4a8ad7dcc1f1bd519f4d1c506984871a25a1db31
 2015-02-05 12:35:07 -08:00
John Spurlock
ac7b9dd39f am 42d3b66f: am e0852368: Fix a few typos in Parcel.java. 
* commit '42d3b66f48906e35244ffc9a45daae87021fc1a5':
  Fix a few typos in Parcel.java.
 2015-02-05 20:27:59 +00:00
Ruben Brunk
a48b550790 am cd0d7cde: Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev 
* commit 'cd0d7cdefef0dbf395e5b159dccb6e884a2077b7':
  camera2: Make legacy error handling more robust.
 2015-02-05 20:18:23 +00:00
John Spurlock
42d3b66f48 am e0852368: Fix a few typos in Parcel.java. 
* commit 'e08523684d5414117f81debd4eb14bc8eb494c29':
  Fix a few typos in Parcel.java.
 2015-02-05 20:18:03 +00:00
Ruben Brunk
cd0d7cdefe Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev 2015-02-05 19:54:37 +00:00
Kenny Guy
74a7024af0 Fix mangled javadoc for setPermittedInputMethods. 
Fix java doc for setPermittedInputMethods.

Bug: 19276777
Change-Id: Iecd670b35cd675ff9dd4654c9876697801eb20ac
 2015-02-05 19:48:38 +00:00
Adam Lesinski
ae4456cbd6 am 967439b4: Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev 
* commit '967439b4d1151a613058b1439e1e4240cdef28d9':
  Make ArrayMap.EMPTY immutable
 2015-02-05 19:40:25 +00:00
Alan Viverette
b11af58bb8 am f15f6a50: Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev 
* commit 'f15f6a5087f22a0d083be9edc08e860e51c9a0d0':
  Invalidate SubtitleView during setText()
 2015-02-05 19:40:12 +00:00
Adam Lesinski
967439b4d1 Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev 2015-02-05 19:27:00 +00:00
Alan Viverette
f15f6a5087 Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev 2015-02-05 19:16:58 +00:00
Adam Lesinski
b6bdb0f02d Make ArrayMap.EMPTY immutable 
This is a regression from KitKat.

Bug:19271657
Change-Id: I11b8e4dd50f6a8d2b15fef66b44aa2d72b1f0349
 2015-02-05 11:11:03 -08:00
Alan Viverette
3f7360df82 Invalidate SubtitleView during setText() 
Ensures that even if layout does not change, the view is redrawn.

Bug: 19277437
Change-Id: I078ee3176c2bac6c754a0e2f378f97370ecef76a
 2015-02-05 09:58:49 -08:00
Alan Viverette
79cc73a095 am bac8e12e: Move layer-list to be top-level element in seek bar progress 
* commit 'bac8e12ebd8ed143cd2f1974280f0495c837def4':
  Move layer-list to be top-level element in seek bar progress
 2015-02-05 04:52:34 +00:00
Zhijun He
b9f0cae9f6 am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev 
* commit '81c80180311803d9faabc0bbd6c0813f44edcf7d':
  Camera2: relax the EV compensation requirements
 2015-02-05 04:50:44 +00:00
Alan Viverette
33e7e42336 am 80252a92: Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev 
* commit '80252a92e5736c62d26a7ee013c60c4fbfe4b66b':
  Allow top-level drawable container in progressDrawable
 2015-02-05 04:50:38 +00:00
Alan Viverette
b1613a0052 am 721a9578: Merge "Replace ic_clear with vector icon" into lmp-mr1-dev 
* commit '721a95784eb646a1bf42debb68da0efddc8cad3d':
  Replace ic_clear with vector icon
 2015-02-05 04:50:34 +00:00
George Mount
722491d84a am c3a043cf: Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS. 
* commit 'c3a043cf0e1c91dcffc2cd596908266ba92a4c28':
  Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
 2015-02-05 04:50:29 +00:00
Ruben Brunk
e3c0434d97 camera2: Make legacy error handling more robust. 
- Relax internal timeout for JPEG captures in LEGACY mode.
- Make RequestThreadManager.quit() idempotent to avoid queuing
  messages on a dead thread's handler.
- Catch RuntimeExceptions from other Camera1 API methods to
  allow proper cleanup + release of Camera1 API client.

Bug: 19255187
Change-Id: I6cb08bb6b832b0d0df6ee6e8983c35de2df4a408
 2015-02-04 17:26:17 -08:00
Alan Viverette
bac8e12ebd Move layer-list to be top-level element in seek bar progress 
There is a bug in <scale>, but this works around it for now. Removes
the previous fix, which broke the initial state due to the level not
propagating when the current drawable was swapped out.

Bug: 19269656
Change-Id: Ibe586ef4ea326a7ce7516ca42a369c5386c24359
 2015-02-04 17:15:01 -08:00
Zhijun He
81c8018031 Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev 2015-02-05 01:10:29 +00:00