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

189925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
f748bb3051 Import translations. DO NOT MERGE 
Change-Id: Ic375b06aab79b9b7d17754eba4dd9d182a669734
Auto-generated-cl: translation import
 2015-04-24 23:58:45 -07:00
Geoff Mendal
c9f5cb8caf Import translations. DO NOT MERGE 
Change-Id: I79db3fdb8e2c5e86259a6c5cefe5e0790a07bc92
Auto-generated-cl: translation import
 2015-04-24 23:44:04 -07:00
Nick Kralevich
9709a1f04c fix compiler error under FORTIFY_SOURCE=2 
frameworks/base/libs/androidfw/ObbFile.cpp:340:5: error: ignoring return value of function declared with warn_unused_result attribute [-Werror,-Wunused-result]
    ftruncate(fd, mFooterStart);
    ^~~~~~~~~ ~~~~~~~~~~~~~~~~
1 error generated.
amake: *** [out/host/linux-x86/obj/STATIC_LIBRARIES/libandroidfw_intermediates/ObbFile.o] Error 1

Change-Id: I7080d64e7a830a10b41c1ebf33c60d32b7c8356e
 2015-04-24 20:27:06 -07:00
Selim Cinek
e39e17dff7 Merge "Improve the falsing logic for unlock motion" 2015-04-25 02:12:52 +00:00
Selim Cinek
9db71054b8 Improve the falsing logic for unlock motion 
Bug: 20563134
Change-Id: I628829915ad2cc7f1df5d0c971def44f6eacdae4
 2015-04-24 19:11:58 -07:00
Etan Cohen
f2570cb595 Merge "Doc fix - incorrect format (included argument) for function reference." 2015-04-25 01:44:27 +00:00
Etan Cohen
912270e22d Doc fix - incorrect format (included argument) for function reference. 
Change-Id: I2cdf7b4f078b1ab0556fcc3fad5287f86641c396
 2015-04-24 18:43:41 -07:00
Aravind Akella
398e11837b Merge "Add hidden SensorManager APIs for injecting sensor data." 2015-04-25 01:40:26 +00:00
Andy Hung
09f9a7adb3 Merge "Hide stretch mode from PlaybackSettings" 2015-04-25 01:28:47 +00:00
Adam Lesinski
58ffaf9061 Merge "Properly mangle file names" 2015-04-25 01:21:00 +00:00
Julia Reynolds
f7d3a766f0 Merge "Only skip unrecognized tags." 2015-04-25 01:09:25 +00:00
Etan Cohen
4e4fec1b8d Merge "Fix documentation - non-public API." 2015-04-25 01:08:11 +00:00
Etan Cohen
237a59767d Fix documentation - non-public API. 
Change-Id: I418bf47b197936b2f50b231425312d5b6d272df8
 2015-04-24 18:06:59 -07:00
Jeff Sharkey
49314cea50 Merge "Migrate primary external storage." 2015-04-25 01:03:08 +00:00
Jeff Sharkey
275e3e43f2 Migrate primary external storage. 
Wire up through MountService to call down into vold.  Watch for
unsolicited events that report progress, including special value "82"
that signals that copy has finished.  We use this value to persist
the volumeUuid in case of unexpected reboot, since it indicates the
new volume is ready.

Wire progress updates through existing callback pipeline.

Update the volume mounting code to match against the persisted UUID
when selecting the primary external storage.

Bug: 19993667
Change-Id: Id46957610fb43517bbfbc368f29b7d430664590d
 2015-04-24 18:01:45 -07:00
Etan Cohen
cd895cdf4d Merge changes from topic 'mwd-merge-042415' 
* changes:
  Rename removeVideoCallListener to unregisterCallback
  Bluetooth document fix: remove reference from open API to hidden entities
  Fix build due to merge of 7595842 and renaming due to 8eb87f0
  Merge commit '052a0da' into merge2
  Merge commit 'db1dbb8' into merge2
  Merge commit '7e5e791' into merge2
  Merge commit '170102d' into merge2
  Merge commit '4cb5d80' into merge2
  Merge commit '83cda00' into merge2
  Merge commit 'c91bc62' into merge2
  Merge commit 'cffc360' into merge2
  Merge commit '7f61051' into merge2
  Merge commit '167c3a7' into merge2
  Merge commit '4467b98' into merge2
  Merge commit '25a217c' into merge2
  Merge commit '04b18ec' into merge2
  Merge commit '7595842' into merge2
  Merge commit '2bbd2b6' into merge2
  Merge commit '4890351' into merge2
  Merge commit 'cd405fe' into merge2
  Merge commit '6ddbb5e' into merge2
  Merge commit 'de93575' into merge2
  Merge commit '9561e74' into merge2
 2015-04-25 00:51:47 +00:00
Ruben Brunk
998ee16570 Merge "camera: Start/stop preview before clearing surface." 2015-04-25 00:48:26 +00:00
Andy Hung
18cb3b5a27 Hide stretch mode from PlaybackSettings 
Different timestretch modes won't be ready for M.

Change-Id: I4fe5ceee5bdf90cb735eb415185812603b5c68a8
 2015-04-24 17:32:57 -07:00
Jim Miller
b423e300f7 Merge "Don't use a WeakReference for fingerprint notification object." 2015-04-25 00:25:54 +00:00
Adrian Roos
965bbb8f2e Merge "Smooth transitions between SHOW_WHEN_LOCKED activities" 2015-04-25 00:18:23 +00:00
Andy Hung
14862ad8a9 Merge "Move channel index computation to native AudioTrack JNI" 2015-04-25 00:18:22 +00:00
Adrian Roos
602c68e4ff Smooth transitions between SHOW_WHEN_LOCKED activities 
Bug: 12536117
Change-Id: Ia5f96e49587661440ae31fba17c42b2e3a9557fb
 2015-04-24 17:12:08 -07:00
Jim Miller
b21e1b2eaa Don't use a WeakReference for fingerprint notification object. 
This was causing a problem where a GC in the system process
would inadvertently remove the callback.

Potential fix for bug 20491119

Change-Id: I9d7d0bb8e29fcd6c52cb3be645bbb9c8e5413d48
 2015-04-24 17:01:43 -07:00
Quddus Chong
20fd8475ef am 6c52d51c: am bbe5effb: docs: Fixed typo in \'Authorizing with Google for REST APIs\' doc. bug: 18025533 
* commit '6c52d51c65613beb23ea135e8a8374f6c2dc1bf8':
  docs: Fixed typo in 'Authorizing with Google for REST APIs' doc. bug: 18025533
 2015-04-24 23:53:59 +00:00
Adam Cohen
daa58a4008 Merge "Remove problematic early return from notifyDataSetChanged" 2015-04-24 23:43:57 +00:00
Adrian Roos
7be8bfc232 Merge "Fix stale inKeyguardInputRestrictedMode" 2015-04-24 23:43:56 +00:00
Quddus Chong
6c52d51c65 am bbe5effb: docs: Fixed typo in \'Authorizing with Google for REST APIs\' doc. bug: 18025533 
* commit 'bbe5effb6682b4ba5e6accd9a226ec7611fe83dc':
  docs: Fixed typo in 'Authorizing with Google for REST APIs' doc. bug: 18025533
 2015-04-24 23:43:49 +00:00
Andy Hung
50c1ed73cd Merge "Unhide new channel masks and deprecate old channel masks" 2015-04-24 23:43:35 +00:00
Jae Seo
344f9e5e9a Merge "TIF: Add TvContentRating constant for unrated content" 2015-04-24 23:41:21 +00:00
Amith Yamasani
bf02d48f4a Merge "More usage tracking" 2015-04-24 23:39:37 +00:00
Arunesh Mishra
b4d533ba53 Merge "Add AudioManager property strings for ultrasound." 2015-04-24 23:29:39 +00:00
Quddus Chong
bbe5effb66 docs: Fixed typo in 'Authorizing with Google for REST APIs' doc. 
bug: 18025533

Change-Id: I6379b2a7be495a506e0e428fe9c68fdbe197704b
 2015-04-24 16:29:28 -07:00
Adam Cohen
005f7cf13e Remove problematic early return from notifyDataSetChanged 
-> If connection to the service fails for whatever reason,
mNotifyDataSetChangedAfterOnServiceConnected can get stuck to true, preventing
future connections to the service. Don't let this prevent from connecting to the
service.

issue 19890339

Change-Id: I376101ae146359109df53add3a3202ba2e1e842d
 2015-04-24 16:23:42 -07:00
Amith Yamasani
f47e51ec60 More usage tracking 
Notification listeners can now report that a notification
has been seen by the user and that package is then marked
as active.

Bug: 20066058
Change-Id: I336040a52c44c21fd0d78b02ec9a19d448c64b40
 2015-04-24 16:12:01 -07:00
Yorke Lee
eca706ed9d Merge "Add APIs to getDefaultDialerPackage and getSystemDialerPackage" 2015-04-24 23:11:42 +00:00
Andy Hung
30d794360f Move channel index computation to native AudioTrack JNI 
Change-Id: I047a9dcce13a38c11da165607d668dfb9d7fa335
 2015-04-24 16:08:27 -07:00
Adrian Roos
4a963ac2fa Fix stale inKeyguardInputRestrictedMode 
Bug: 20536027
Change-Id: Ica65b388ae2c58a45c66e9f30efa3fadeded8d47
 2015-04-24 16:05:29 -07:00
Doris Liu
d34f44028d Merge "Remove distance based animation duration API" 2015-04-24 23:05:01 +00:00
Fyodor Kupolov
de1500c256 Merge "Added SystemServiceRegistry to preloaded-classes" 2015-04-24 23:02:42 +00:00
Seigo Nonaka
9a1cf497e5 Merge "Notify IME visibility when showWindow is called." 2015-04-24 22:46:14 +00:00
Zhijun He
f9c2dcf6b4 Merge "Image: fix build break" 2015-04-24 22:38:50 +00:00
Jens Ole Lauridsen
0525677343 Merge "parcel: Add efficient methods for writing and reading a parcelable." 2015-04-24 22:37:46 +00:00
Wale Ogunwale
584e513952 am cc9c597d: am d639a453: am e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider"" 
* commit 'cc9c597dad6d99242ed2903d8760922f66223401':
  Revert "[ActivityManager] Improve multi-thread access the same provider"
 2015-04-24 22:35:34 +00:00
Wale Ogunwale
169364c1e5 am 4cdc7e84: am e2047da6: am d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider"" 
* commit '4cdc7e842d8b1ff1e70d2a0b4a2a1939fa116563':
  Revert "Clean-up state if we have an exception when acquiring provider"
 2015-04-24 22:35:26 +00:00
Zhijun He
766ba09207 Image: fix build break 
Change-Id: I51e91a6c370626603f79371c16c8a10195ba63da
 2015-04-24 15:34:11 -07:00
Wale Ogunwale
cc9c597dad am d639a453: am e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider"" 
* commit 'd639a4532417bf605f03b3b5efdb3a9e1cbe6661':
  Revert "[ActivityManager] Improve multi-thread access the same provider"
 2015-04-24 22:26:08 +00:00
Wale Ogunwale
4cdc7e842d am e2047da6: am d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider"" 
* commit 'e2047da6f3f21fc702d35b7d1c4e9bb62c963dac':
  Revert "Clean-up state if we have an exception when acquiring provider"
 2015-04-24 22:26:04 +00:00
Etan Cohen
1418054108 Rename removeVideoCallListener to unregisterCallback 
Change-Id: Ie6b5ac9131e81900efc7d3fa67056aa47d566a44
 2015-04-24 15:22:03 -07:00
Wale Ogunwale
d639a45324 am e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider"" 
* commit 'e60077e62a441dbcc132b2abb35d998ab48d261c':
  Revert "[ActivityManager] Improve multi-thread access the same provider"
 2015-04-24 22:15:02 +00:00
Wale Ogunwale
e2047da6f3 am d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider"" 
* commit 'd9bf26522b930a8d5d25f6e28c390e39fee6d0b2':
  Revert "Clean-up state if we have an exception when acquiring provider"
 2015-04-24 22:14:56 +00:00