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

62142 Commits

Author SHA1 Message Date
Yin-Chia Yeh
19e1512dca am cb6eae0e: Merge "Camera: doc update for independent 3A" into lmp-mr1-dev 
automerge: 46810bf

* commit '46810bf2002b89ed2ad90e000294011f928af12a':
  Camera: doc update for independent 3A
 2014-11-14 21:42:45 +00:00
John Spurlock
8fe10b4b04 Merge "Volume: Move "Muted by" string from sysui to frameworks." into lmp-mr1-dev 2014-11-14 21:41:43 +00:00
Eric Laurent
8c8b919564 am 99253d00: Merge "AudioRecorder read buffer overflow" into lmp-mr1-dev 
automerge: 5ff6057

* commit '5ff6057bd32737c808f978eae6c100ffa24148d1':
  AudioRecorder read buffer overflow
 2014-11-14 21:41:15 +00:00
Raph Levien
58fa003577 am 505ffe36: Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev 
* commit '505ffe3633f45778e493e23ad8c163f09ed1dbb5':
  Check bounds on CharSequence drawText methods
 2014-11-14 20:56:46 +00:00
Raph Levien
fbe0e8f418 am 25f7c4b9: Merge "Update hint text color even when text present" into lmp-mr1-dev 
* commit '25f7c4b99284cd1e118f50bd585e6534acfad7c4':
  Update hint text color even when text present
 2014-11-14 20:56:40 +00:00
Raph Levien
be1ad50b34 am cda81f2d: Merge "Fudge clipRect in TextView for extra cursor width" into lmp-mr1-dev 
* commit 'cda81f2ded39b53dd813071760ad235363292d52':
  Fudge clipRect in TextView for extra cursor width
 2014-11-14 20:56:35 +00:00
Raph Levien
505ffe3633 Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev 2014-11-14 20:54:29 +00:00
Raph Levien
25f7c4b992 Merge "Update hint text color even when text present" into lmp-mr1-dev 2014-11-14 20:53:14 +00:00
Raph Levien
cda81f2ded Merge "Fudge clipRect in TextView for extra cursor width" into lmp-mr1-dev 2014-11-14 20:51:58 +00:00
John Spurlock
96e7f0ed1a Volume: Move "Muted by" string from sysui to frameworks. 
To enable sharing with Settings.

Bug: 17461563
Change-Id: Icdb5f85eb4bcaa1ead7d77c1460e06ad3f0604d5
 2014-11-14 14:38:03 -05:00
Jeff Sharkey
47d2c97e70 am 27936ad3: Merge "Block loading WebView in privileged processes." into lmp-mr1-dev 
* commit '27936ad3a677509fab1174c7b6655c894f018143':
  Block loading WebView in privileged processes.
 2014-11-14 19:33:49 +00:00
Jeff Sharkey
27936ad3a6 Merge "Block loading WebView in privileged processes." into lmp-mr1-dev 2014-11-14 19:24:53 +00:00
Yin-Chia Yeh
46810bf200 am cb6eae0e: Merge "Camera: doc update for independent 3A" into lmp-mr1-dev 
* commit 'cb6eae0e2eda2a9383ba2682b739b3616a9eaefc':
  Camera: doc update for independent 3A
 2014-11-14 19:06:37 +00:00
Eric Laurent
5ff6057bd3 am 99253d00: Merge "AudioRecorder read buffer overflow" into lmp-mr1-dev 
* commit '99253d001f835a8d23c337b8dfd6a6cbc6d7a740':
  AudioRecorder read buffer overflow
 2014-11-14 19:06:27 +00:00
Jeff Sharkey
85844916b8 Block loading WebView in privileged processes. 
WebView is very powerful, but it also has a large attack area.  To
improve security, refuse to load WebView components when running as
the root or system UIDs.

Bug: 18376908
Change-Id: I515b819033586076b1a9668023bb43ee0295d003
 2014-11-14 11:02:27 -08:00
Yin-Chia Yeh
cb6eae0e2e Merge "Camera: doc update for independent 3A" into lmp-mr1-dev 2014-11-14 18:36:33 +00:00
Eric Laurent
99253d001f Merge "AudioRecorder read buffer overflow" into lmp-mr1-dev 2014-11-14 17:42:47 +00:00
Esteban Talavera
fb70be1d1f am 95162ad2: am 22dc3b7b: New AccountManager method to copy accounts between users. 
* commit '95162ad2eaa45cf2643b564c7fd03bfe0e4844de':
  New AccountManager method to copy accounts between users.
 2014-11-14 11:42:48 +00:00
Esteban Talavera
95162ad2ea am 22dc3b7b: New AccountManager method to copy accounts between users. 
* commit '22dc3b7ba111e27bce99a7cce966598e7873508c':
  New AccountManager method to copy accounts between users.
 2014-11-14 11:37:33 +00:00
Esteban Talavera
22dc3b7ba1 New AccountManager method to copy accounts between users. 
Adding the copyAccountToUser method which copies an account
along with its credentials to a different user.

Also an extra in the public api to identify the account to migrate
during provisioning.

Bug: 17716971
Change-Id: I2f29f1765ba0d360a3894b13ef86253b7c7d3284
 2014-11-14 11:09:27 +00:00
Sander Alewijnse
75f79bc08b am 7bec28c5: am f39cec0b: Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev 
* commit '7bec28c5a1e1c0787542930ed291f5aadfee6e75':
  Add extra to enable device admins to skip removal of system apps.
 2014-11-14 10:38:44 +00:00
Sander Alewijnse
7bec28c5a1 am f39cec0b: Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev 
* commit 'f39cec0b068abcf306eb91c304ed2eb76e60f8c0':
  Add extra to enable device admins to skip removal of system apps.
 2014-11-14 10:32:45 +00:00
Sander Alewijnse
f39cec0b06 Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev 2014-11-14 10:26:38 +00:00
Mark Renouf
9987386729 am 7b6cadd4: am 437d02d3: am cd22c3d6: Merge "Sets windowOverscan for all Wear DeviceDefault themes." into lmp-sprout-dev 
* commit '7b6cadd4045a1d33b4b376b84f0fc1d14f48566b':
  Sets windowOverscan for all Wear DeviceDefault themes.
 2014-11-14 02:29:52 +00:00
Mark Renouf
7b6cadd404 am 437d02d3: am cd22c3d6: Merge "Sets windowOverscan for all Wear DeviceDefault themes." into lmp-sprout-dev 
* commit '437d02d389711487a29662455b52a601053d9749':
  Sets windowOverscan for all Wear DeviceDefault themes.
 2014-11-14 02:24:11 +00:00
Mark Renouf
437d02d389 am cd22c3d6: Merge "Sets windowOverscan for all Wear DeviceDefault themes." into lmp-sprout-dev 
* commit 'cd22c3d67c98a6ac98291c3337e6506546e771be':
  Sets windowOverscan for all Wear DeviceDefault themes.
 2014-11-14 02:14:29 +00:00
Alan Viverette
db3aa6be93 am 04bea090: am 0224d25d: Merge "Account for window bounds in accessibility view click point computation" into lmp-mr1-dev 
* commit '04bea0905724e24ce8b80187134e7f698607ae1a':
  Account for window bounds in accessibility view click point computation
 2014-11-14 01:56:50 +00:00
Alan Viverette
04bea09057 am 0224d25d: Merge "Account for window bounds in accessibility view click point computation" into lmp-mr1-dev 
* commit '0224d25db2f897ddfc29a722ad91d67dcf2500a9':
  Account for window bounds in accessibility view click point computation
 2014-11-14 01:51:38 +00:00
Alan Viverette
0224d25db2 Merge "Account for window bounds in accessibility view click point computation" into lmp-mr1-dev 2014-11-14 01:46:01 +00:00
John Reck
b35c9602cf Wire up surface width/height to lockHardwareCanvas 
Bug: 18338026
Change-Id: I6c37774ef1312278ae81280561060662fef923fb
 2014-11-13 16:15:08 -08:00
Mark Renouf
de7187b956 Sets windowOverscan for all Wear DeviceDefault themes. 
Without this flag, window insets will be consumed by the first View
which does not explicitly override onApplyWindowInsets. This is either
SwipeDismissLayout or the content view of the activity (if swipeDismiss
is not enabled).

BUG: 18376451
Change-Id: I5e590bad9810a9a232a6c318f715d587a3290f34
 2014-11-13 19:12:55 -05:00
Andreas Gampe
e64565e0a5 Merge "Frameworks/base: Mask pdfium warning" into lmp-mr1-dev-plus-aosp 2014-11-14 00:09:02 +00:00
Andreas Gampe
f4e341d99c Frameworks/base: Mask pdfium warning 
Mask out warnings from external/.

Change-Id: I371e1346925c7eb5cdc9c4dcffab41ff0c6ddd63
 2014-11-13 16:07:13 -08:00
Alan Viverette
8f5de8c6c0 am 96dacf36: am 24859ba0: Merge "Don\'t dismiss AutoCompleteTextView on focus change while temp detached" into lmp-mr1-dev 
* commit '96dacf3659c6fe9a1ac509ec242eb446307c6833':
  Don't dismiss AutoCompleteTextView on focus change while temp detached
 2014-11-14 00:03:27 +00:00
Alan Viverette
57f77e44c1 am d200288a: am 3fbb55c9: Merge "Make indeterminate progress alpha consistent with determinate" into lmp-mr1-dev 
* commit 'd200288a8b703d200859682baa3d6ff7afabd175':
  Make indeterminate progress alpha consistent with determinate
 2014-11-14 00:03:22 +00:00
ztenghui
bac3f5a6f0 am 9f671553: am 475569e9: Merge "Fix the starting pen\'s position when a path close." into lmp-mr1-dev 
* commit '9f67155332e49686ef622b096b715ee62845d401':
  Fix the starting pen's position when a path close.
 2014-11-14 00:03:16 +00:00
Abhijith Shastry
0f0642075e am 530f25d6: am fb8db1c8: Merge "new sms/mms carrier app API" into lmp-mr1-dev 
* commit '530f25d629f0e78ca2e0cd372e907207d2318182':
  new sms/mms carrier app API
 2014-11-14 00:02:51 +00:00
Alan Viverette
96dacf3659 am 24859ba0: Merge "Don\'t dismiss AutoCompleteTextView on focus change while temp detached" into lmp-mr1-dev 
* commit '24859ba016f740c16113e04271ebe6b3eb61a241':
  Don't dismiss AutoCompleteTextView on focus change while temp detached
 2014-11-13 23:53:13 +00:00
Alan Viverette
d200288a8b am 3fbb55c9: Merge "Make indeterminate progress alpha consistent with determinate" into lmp-mr1-dev 
* commit '3fbb55c9061f6ea4b7bc63dfea1d86ba5bb308ad':
  Make indeterminate progress alpha consistent with determinate
 2014-11-13 23:53:08 +00:00
ztenghui
9f67155332 am 475569e9: Merge "Fix the starting pen\'s position when a path close." into lmp-mr1-dev 
* commit '475569e98a7d8d42b981df54c70974ad99336328':
  Fix the starting pen's position when a path close.
 2014-11-13 23:53:03 +00:00
Abhijith Shastry
530f25d629 am fb8db1c8: Merge "new sms/mms carrier app API" into lmp-mr1-dev 
* commit 'fb8db1c84b7fd59f596a6c090a8035fab08ef2f5':
  new sms/mms carrier app API
 2014-11-13 23:50:12 +00:00
Andreas Gampe
035a7b0235 am 0626ec58: Merge "Frameworks/base: Wall Werror in core/jni" 
* commit '0626ec58243c9dc7f4812a453ef9456b1f7ff1f4':
  Frameworks/base: Wall Werror in core/jni
 2014-11-13 23:35:22 +00:00
Andreas Gampe
0f0b491966 Frameworks/base: Wall Werror in core/jni 
Turn on -Wall -Werror in core/jni. Fix warnings.

Clang TODO: For GCC we need to turn off Wunused-but-set-variable in
the GL bindings. However, Clang doesn't have that warning and thus
complains about an unknown pragma. It is necessary to make the
pragma #ifdef-ed on the compiler being GCC.

Change-Id: I14cab48d45c2771eef0432082356c47ed44a3d7f
 2014-11-13 15:20:37 -08:00
Ruben Brunk
0c22e6919a camera2: Add READ_SETTINGS capability. 
Bug: 18281970
Change-Id: I28be92a85f0a843c690f9ff49263440cd871e40d
 2014-11-13 15:15:07 -08:00
Alan Viverette
24859ba016 Merge "Don't dismiss AutoCompleteTextView on focus change while temp detached" into lmp-mr1-dev 2014-11-13 22:45:12 +00:00
Alan Viverette
3fbb55c906 Merge "Make indeterminate progress alpha consistent with determinate" into lmp-mr1-dev 2014-11-13 22:44:13 +00:00
ztenghui
475569e98a Merge "Fix the starting pen's position when a path close." into lmp-mr1-dev 2014-11-13 22:41:55 +00:00
Abhijith Shastry
fb8db1c84b Merge "new sms/mms carrier app API" into lmp-mr1-dev 2014-11-13 22:15:46 +00:00
Alan Viverette
95b3144782 Make indeterminate progress alpha consistent with determinate 
Both should match the default disabledAlpha for controls.

BUG: 15900514
Change-Id: Ie7c801bc208a14f14926d38b462f49d1f91b28d0
 2014-11-13 14:04:32 -08:00
Yuncheol Heo
417a95685e CEC: Fix a bug in HdmiPortInfo.createFromParcel(). 
- Added equals() for the testing.

Bug: 18376178
Change-Id: Icc7d5fe78b3132bf51754fc3bb0d5a40e0d3b20a
 2014-11-14 06:43:31 +09:00