OSDN Git Service
Keisuke Kuroyanagi [Tue, 16 Feb 2016 23:26:31 +0000 (23:26 +0000)]
Merge "Make scrollbar draggable only when it's visible." into nyc-dev
Siyamed Sinir [Tue, 16 Feb 2016 22:37:53 +0000 (22:37 +0000)]
Merge "Ellipsized and Non-ellipsized baselines should be same." into nyc-dev
Wale Ogunwale [Tue, 16 Feb 2016 22:32:22 +0000 (22:32 +0000)]
Merge changes from topic 'flaky-test' into nyc-dev
* changes:
Fixed issue with losing window name when copying WindowManager.LayoutParams
Added AM API to remove a stack
Don't resume activity on start if there are activities pausing.
Selim Gurun [Tue, 16 Feb 2016 22:17:41 +0000 (22:17 +0000)]
Merge "Better document the ignore behavior for client cert api" into nyc-dev
George Mount [Tue, 16 Feb 2016 21:38:01 +0000 (21:38 +0000)]
Merge "Fix TransitionSet javadoc to use transitionOrdering attribute." into nyc-dev
George Mount [Tue, 16 Feb 2016 21:37:39 +0000 (21:37 +0000)]
Merge "Don't use forceVisibility for Activity Transitions." into nyc-dev
Jason Monk [Tue, 16 Feb 2016 21:26:24 +0000 (21:26 +0000)]
Merge "Battery graph in QS Detail" into nyc-dev
Jason Monk [Thu, 11 Feb 2016 16:33:09 +0000 (11:33 -0500)]
Battery graph in QS Detail
Add new usage graph view to SettingsLib that shows usage with
same labels and whatnot.
Use that graph in the battery detail panel to show more stuffs.
Change-Id: I397b1314f65f668df566e93bdbc15420e1b3a280
Svetoslav Ganov [Thu, 11 Feb 2016 16:50:43 +0000 (08:50 -0800)]
Fail fast when trying to delete a non-existing pacakge.
bug:
26921392
Change-Id: I518cc43f3b1b28bd239093feead46107c62eb419
Makoto Onuki [Tue, 16 Feb 2016 20:47:09 +0000 (20:47 +0000)]
Merge "Don't allow deactivating DAs when the user is not unlocked" into nyc-dev
Selim Gurun [Tue, 16 Feb 2016 20:30:08 +0000 (12:30 -0800)]
Better document the ignore behavior for client cert api
Bug:
26361557
When the embedded app requests a ignore of a client cert request,
webview does not cache the response of the app. However, underlying
layers could. Clarify the document.
Change-Id: I43e6a4c91727f71c88ca69e1334f64de9f66905a
Andreas Gampe [Tue, 16 Feb 2016 19:47:31 +0000 (19:47 +0000)]
Merge "Frameworks/base: Fix registration function" into nyc-dev
Esteban Talavera [Tue, 16 Feb 2016 19:29:06 +0000 (19:29 +0000)]
Merge "Let admin disable fingerprint for the work challenge" into nyc-dev
Alan Viverette [Tue, 16 Feb 2016 19:05:59 +0000 (19:05 +0000)]
Merge "Force uniform width for MATCH_PARENT in AlertDialogLayout" into nyc-dev
Leon Scroggins [Tue, 16 Feb 2016 19:02:45 +0000 (19:02 +0000)]
Merge "Clean up some Skia includes" into nyc-dev
Robin Lee [Tue, 16 Feb 2016 18:56:52 +0000 (18:56 +0000)]
Merge "Auto-call prepare() for new always-on VPNs" into nyc-dev
Andreas Gampe [Tue, 16 Feb 2016 18:09:31 +0000 (10:09 -0800)]
Frameworks/base: Fix registration function
Registration functions return "int."
Change-Id: Icb8d35f3bc23794cdb22db1c1adda236c9d8676e
Adam Lesinski [Tue, 16 Feb 2016 18:34:27 +0000 (18:34 +0000)]
Merge "Fix up some small resource issues" into nyc-dev
Aga Wronska [Tue, 16 Feb 2016 18:29:49 +0000 (18:29 +0000)]
Merge "Fix focus issues in directory fragment * Empty directory view gets focus when shown * Skip opening drawer when showing empty search results * Fix typo" into nyc-dev
Aga Wronska [Fri, 12 Feb 2016 17:15:32 +0000 (09:15 -0800)]
Fix focus issues in directory fragment
* Empty directory view gets focus when shown
* Skip opening drawer when showing empty search results
* Fix typo
Bug:
27109140
Change-Id: Ie62d48e1c3f78e5244d88067587b3e5986f99a03
Peter Qiu [Tue, 16 Feb 2016 18:14:42 +0000 (18:14 +0000)]
Merge "WifiConfiguration: add constants for radio band" into mm-wireless-dev
am:
03d7581cf6
* commit '
03d7581cf6dcc8072fe22c834513593a46fcf93b':
WifiConfiguration: add constants for radio band
Wale Ogunwale [Mon, 15 Feb 2016 16:28:47 +0000 (08:28 -0800)]
Fixed issue with losing window name when copying WindowManager.LayoutParams
It is possible for the WindowManager.LayoutParams set from a view/window on
the client side not to have the LayoutParams.mTitle set. This is normally
not an issue as we later set it to the package name before passing the
LayoutParams to window manager. However, we rely on the full window name
in order to identify unique windows during CTS hostside tests. We now
retain the current LayoutParams.mTitle if the LayoutParams we are copying
form didn't set one.
Bug:
26982752
Change-Id: Icc3c5937391ed1646c3777921c6f61c27ebec05d
Wale Ogunwale [Fri, 12 Feb 2016 20:56:32 +0000 (12:56 -0800)]
Added AM API to remove a stack
Use the new API when closing Pip.
Bug:
26982752
Change-Id: I074d23b5535a4534626183ab77142d3932a803f0
Wale Ogunwale [Fri, 12 Feb 2016 20:22:19 +0000 (12:22 -0800)]
Don't resume activity on start if there are activities pausing.
The path to start an activity if it isn't running was unconditionally
resuming the starting activity which we don't do if there are activities
pausing. It now starts the activity in a paused state if other activities
are pausing. It is then resumed when pause completes.
Also, improved logging in BoundsAnimationController and removed some
disabled code that has been in the codebase for 6yrs...
Bug:
26982752
Change-Id: Ie042fc938331127f1270fca1b5905b067b9dae7c
Alan Viverette [Tue, 16 Feb 2016 17:53:36 +0000 (12:53 -0500)]
Force uniform width for MATCH_PARENT in AlertDialogLayout
The initial layout passes run using whatever was specified by the
parent, which ensures that TOO_SMALL will get set correctly when
needed. The final layout pass runs as EXACTLY to ensure that
MATCH_PARENT widths are correctly set.
Bug:
27030200
Change-Id: Ia7af3f75746e725761e78e7c4eefb0b31f499113
Peter Qiu [Tue, 16 Feb 2016 18:04:13 +0000 (18:04 +0000)]
Merge "WifiConfiguration: add constants for radio band" into mm-wireless-dev
Wale Ogunwale [Tue, 16 Feb 2016 17:54:32 +0000 (17:54 +0000)]
Merge "Force resize pre-N apps that don't have fixed orientation." into nyc-dev
Winson Chung [Tue, 16 Feb 2016 17:32:35 +0000 (17:32 +0000)]
Merge "Adding null check for invalid activity" into nyc-dev
Winson [Tue, 16 Feb 2016 17:28:54 +0000 (09:28 -0800)]
Adding null check for invalid activity
Bug:
24569398
Change-Id: I509bacaab810407a3d4b44781f698b5c76a6af8a
Dongwon Kang [Tue, 16 Feb 2016 17:22:07 +0000 (17:22 +0000)]
Merge "TIF: Unhide TvInputInfo.isHidden/loadCustomLabel" into nyc-dev
Jaewan Kim [Tue, 16 Feb 2016 17:11:57 +0000 (17:11 +0000)]
Merge "Revert "PIP: Use long press HOME for PIP on Android TV (2/2)"" into nyc-dev
Jaewan Kim [Fri, 12 Feb 2016 10:01:02 +0000 (19:01 +0900)]
Revert "PIP: Use long press HOME for PIP on Android TV (2/2)"
Long press HOME will launch recents instead.
Bug:
27159966
Change-Id: I9a4fd847d716d7e4e4754c7a9c48628c46f82233
Jeff Sharkey [Tue, 16 Feb 2016 16:48:29 +0000 (16:48 +0000)]
Merge "More protected broadcasts." into nyc-dev
Jeff Sharkey [Tue, 16 Feb 2016 16:47:47 +0000 (16:47 +0000)]
Merge "Disable StrictMode when starting activity." into nyc-dev
Tao Bao [Tue, 16 Feb 2016 16:46:53 +0000 (16:46 +0000)]
Merge "BootReceiver: Stop using SharedPreferences." into nyc-dev
Jeff Sharkey [Tue, 16 Feb 2016 16:41:54 +0000 (09:41 -0700)]
More protected broadcasts.
These actions are owned by the system and should not be sent by
third-party apps for security reasons.
Bug:
27171917,
27169730,
27172357,
27163393
Change-Id: I3161cd3c1c37d26a92723b22878dc5aef6f30c47
Leon Scroggins III [Tue, 16 Feb 2016 15:20:11 +0000 (10:20 -0500)]
Clean up some Skia includes
Neither of these files need SkScalerContext.h. Remove those includes.
One really needs SkGlyph.h, so include it instead.
Change-Id: Ic7cfce9e7784c9290c5a2dfdd8385b65d32f9b76
Jeff Sharkey [Tue, 16 Feb 2016 16:21:51 +0000 (09:21 -0700)]
Disable StrictMode when starting activity.
Since intents can come in from older apps, don't let them crash us
by including file:// Uris. This narrows the relaxation to only apply
when starting the requested intent.
Bug:
27070755
Change-Id: Ifcf9068424e072f52758c8feeab5fbf23d678a2e
Rubin Xu [Tue, 16 Feb 2016 16:12:44 +0000 (16:12 +0000)]
Merge "Initialize mTiles before constructing AutoTileManager" into nyc-dev
Yohei Yukawa [Tue, 16 Feb 2016 16:11:49 +0000 (16:11 +0000)]
Merge changes I0f79243e,Ia27e19f9,Iec6b89f0,I276c7eb0 into nyc-dev
* changes:
Have unified setter/getter for Secure Settings.
Remove redundant arguments.
Use Context#getSystemService(Class<T>) in IMMS.
Use Java7 diamond operator in InputMethodUtils.
Jason Monk [Tue, 16 Feb 2016 15:40:47 +0000 (15:40 +0000)]
Merge "Add missing cast tile" into nyc-dev
Jason Monk [Tue, 16 Feb 2016 15:39:04 +0000 (10:39 -0500)]
Add missing cast tile
Bug:
27061481
Change-Id: Icf037b199c382096d2145a7b3a169be2f6079e54
George Mount [Tue, 16 Feb 2016 15:20:42 +0000 (15:20 +0000)]
Merge "Null check for fade start alpha value." into nyc-dev
George Mount [Tue, 16 Feb 2016 15:19:03 +0000 (15:19 +0000)]
Merge "Set the hover state to the same as focus state in RippleDrawable." into nyc-dev
Neil Fuller [Tue, 16 Feb 2016 15:01:43 +0000 (15:01 +0000)]
Merge "Fix a compilation error due to 1.8 type inference differences" into nyc-dev
Jason Monk [Tue, 16 Feb 2016 15:01:32 +0000 (15:01 +0000)]
Merge "Fix RTL in Nav Bar" into nyc-dev
Shreyas Basarge [Tue, 16 Feb 2016 14:55:43 +0000 (14:55 +0000)]
Merge "Fixes JobScheduler not persisting flex and sourcePackage" into nyc-dev
Leon Scroggins [Tue, 16 Feb 2016 14:51:35 +0000 (14:51 +0000)]
Merge "use std factory for compose-shader" into nyc-dev
Erik Kline [Tue, 16 Feb 2016 10:15:09 +0000 (10:15 +0000)]
Add IpManager.ProvisioningRequest class
am:
93b1a36e31
* commit '
93b1a36e31b42c5b33a0164f2832ab9aa12d9a00':
Add IpManager.ProvisioningRequest class
Erik Kline [Thu, 11 Feb 2016 11:36:41 +0000 (20:36 +0900)]
Add IpManager.ProvisioningRequest class
This class captures provisioning request parameters to be passed to
IpManager#startProvisioning().
Bug:
26991160
Change-Id: I56652bbc4b9ae6cfca3f225a8d99cdfc01bb54d9
Arunesh Mishra [Tue, 16 Feb 2016 08:09:44 +0000 (08:09 +0000)]
Merge "Fix boot loop problem for volantis." into nyc-dev
Arunesh Mishra [Tue, 16 Feb 2016 07:50:38 +0000 (23:50 -0800)]
Fix boot loop problem for volantis.
Bug:
27192965
Change-Id: I90febaf6a750d539847f45c2795d74b2a4b69f02
Tomasz Mikolajewski [Tue, 16 Feb 2016 08:04:36 +0000 (08:04 +0000)]
Merge "Display correct icons in grid view." into nyc-dev
Tomasz Mikolajewski [Tue, 16 Feb 2016 03:28:43 +0000 (12:28 +0900)]
Display correct icons in grid view.
Bug:
27183062
Change-Id: I4c0fafc7bc6f0e2dc3d1cbdf3debf6312bb85d82
Sungsoo Lim [Tue, 16 Feb 2016 06:20:16 +0000 (15:20 +0900)]
Minor changes on MediaBrowser
- Rename add and remove in Subscription putCallback and removeCallback
for better readability.
- Fix a broken link of javadoc.
Change-Id: If41941d1134d4ee6ef953932ca572f5d445a2aff
Wale Ogunwale [Tue, 16 Feb 2016 03:31:50 +0000 (19:31 -0800)]
Force resize pre-N apps that don't have fixed orientation.
We were previously only doing it for SCREEN_ORIENTATION_UNSPECIFIED,
but there are other orientation settings that aren't fixed that we
need to handle.
Change-Id: If21fcd8312b6267407d94b6646158ac6eae44b44
Winson Chung [Tue, 16 Feb 2016 01:46:08 +0000 (01:46 +0000)]
Merge "Better focus handling after dismissing task/scrolling." into nyc-dev
Winson [Tue, 16 Feb 2016 01:43:01 +0000 (17:43 -0800)]
Better focus handling after dismissing task/scrolling.
- When there is no focused task, focus the next task closest to the
stack scroll in the focus direction.
- Fixing small regression where no task would focus when alt-tabbing
because the index was out of bounds.
Change-Id: I2555c9340f40affc371f52d51d88af0eeda53b2e
Jeff Sharkey [Tue, 16 Feb 2016 01:38:04 +0000 (01:38 +0000)]
Merge "Add path cache to avoid SharedPreferences jank." into nyc-dev
Jeff Sharkey [Tue, 16 Feb 2016 01:35:57 +0000 (18:35 -0700)]
Add path cache to avoid SharedPreferences jank.
The old getSharedPreferences() API had a side-effect behavior that
subsequent calls wouldn't touch disk if there was a cache hit. Now
that we're using File as the cache key, we were generating the path
every time, which resulted in touching disk.
To bring back the old behavior, let's add yet another cache!
Bug:
26979210
Change-Id: Ib8346c6f69ae25f8f164e3b7e05bc6358de38906
Winson Chung [Tue, 16 Feb 2016 00:54:16 +0000 (00:54 +0000)]
Merge "Fixing issue with front task dimming when scrolled back." into nyc-dev
Winson [Tue, 16 Feb 2016 00:52:27 +0000 (16:52 -0800)]
Fixing issue with front task dimming when scrolled back.
Change-Id: I30d88796e7af13734c9a33def05b62bed4fb2e96
Jeff Sharkey [Tue, 16 Feb 2016 00:47:48 +0000 (00:47 +0000)]
Merge "Add feature versions for devices and apps." into nyc-dev
Winson Chung [Tue, 16 Feb 2016 00:46:00 +0000 (00:46 +0000)]
Merge "Tweaking stack shadows and layout." into nyc-dev
Jeff Sharkey [Tue, 16 Feb 2016 00:25:57 +0000 (17:25 -0700)]
Add feature versions for devices and apps.
We're starting to see more instances of device features that will
increment separately from the SDK API level, such as camera HAL,
GPU capabilities, Bluetooth, and other hardware standards.
This change adds the ability for device features to specify a
version, which is defined to be backwards compatible. That is, apps
requesting an older version of a feature must continue working on
devices with a newer version of that same feature.
When a version is undefined, we assume the default version "0".
Bug:
27162500
Change-Id: If890bf3f3dbb715e8feb80e7059a0d65618482ea
Winson [Mon, 15 Feb 2016 23:40:08 +0000 (15:40 -0800)]
Tweaking stack shadows and layout.
- Properly setting view outline alpha
- Ensuring that dismissing while in focused state will return to
non-focused state
- Fixing mis-calculation with bottom stack area
Change-Id: I281b7707421ffde4225180c63c7d40bf325f7f72
Jeff Sharkey [Mon, 15 Feb 2016 22:36:21 +0000 (22:36 +0000)]
Merge "Filter components, prevent app start in safe mode." into nyc-dev
Jeff Sharkey [Mon, 15 Feb 2016 22:33:31 +0000 (15:33 -0700)]
Filter components, prevent app start in safe mode.
When device is in safe mode, we're trying to keep third-party code
from running to give us a stable platform. The ideal approach would
be to treat these apps as temporarily "uninstalled" when in safe mode,
but not all system internals are ready for this.
Instead, go back to previous behavior where we simply filtered
non-system components. This isn't perfect, since there are still
cracks through which components can leak out (GET_ACTIVITIES, etc).
So as a last-ditch sanity effort, refuse to fork any third-party apps
while running in safe mode.
Bug:
27165374
Change-Id: I044ede02e923c499159faf59b12e79b97fe77fba
Tao Bao [Sat, 13 Feb 2016 00:41:25 +0000 (16:41 -0800)]
BootReceiver: Stop using SharedPreferences.
BootReceiver was using SharedPreferences to record the timestamp that a
log file was lastly added to the dropbox. It no longer works after the
cleanup of the ContextImpl, because Context storage APIs are designed
for app data storage (as opposed to the system server). This CL switches
to writing its own xml file instead (/data/system/log-files.xml).
Bug:
26966507
Change-Id: Ife6b7544a7636b37dd239f059d1ca8c9c28f81a3
Jaewan Kim [Mon, 15 Feb 2016 02:46:20 +0000 (11:46 +0900)]
PIP: Prevent onboarding activity from launching on pinned stack
Bug:
27153338
Change-Id: I7a3b5c5306e0760495b43b0deb612b3e711ad56e
Jeff Sharkey [Mon, 15 Feb 2016 21:16:08 +0000 (14:16 -0700)]
Explicitly chmod() for compatibility.
Apps typically have a umask() that prevents the mkdir() from setting
the requested permissions.
Bug:
27116987
Change-Id: Ia14e7e31531328ab36e902a864b3d2891feec544
Neil Fuller [Mon, 15 Feb 2016 21:03:41 +0000 (21:03 +0000)]
Fix a compilation error due to 1.8 type inference differences
The code does not compile when the Jack compiler is set to
-D jack.java.source.version=1.8.
The change has no functional impact.
Bug:
26753820
Change-Id: I19d3ffd65e31648d95bb7701d89710015cfaf552
Jason Monk [Mon, 15 Feb 2016 19:56:45 +0000 (14:56 -0500)]
Fix RTL in Nav Bar
Change-Id: I0cd34c15d3985db787268ba89708758048fe0980
Geoff Mendal [Mon, 15 Feb 2016 16:45:21 +0000 (16:45 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 15 Feb 2016 16:44:45 +0000 (16:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Shreyas Basarge [Fri, 12 Feb 2016 15:49:31 +0000 (15:49 +0000)]
Fixes JobScheduler not persisting flex and sourcePackage
There was a bug with persisteing and restoring flex and
sourcePackage. Fixed it and added tests.
Change-Id: Ie8e4714b4727ecef4254773fd4339b28f4a47c01
Geoff Mendal [Mon, 15 Feb 2016 15:34:56 +0000 (07:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib7501b8ad45b96229429a116525cca998dc55082
Auto-generated-cl: translation import
Geoff Mendal [Mon, 15 Feb 2016 15:24:27 +0000 (07:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2e17b7941eeca02834d88b47e3283b9b74066439
Auto-generated-cl: translation import
Geoff Mendal [Mon, 15 Feb 2016 15:20:19 +0000 (15:20 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 15 Feb 2016 15:19:37 +0000 (07:19 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5450d165959f42088148bf3aa9789d73137475bc
Auto-generated-cl: translation import
Geoff Mendal [Mon, 15 Feb 2016 15:16:34 +0000 (15:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 15 Feb 2016 15:16:11 +0000 (07:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icea0738fea2c10d4f4c55d4a5e1febd362dcbd3f
Auto-generated-cl: translation import
Rubin Xu [Mon, 15 Feb 2016 14:44:44 +0000 (14:44 +0000)]
Initialize mTiles before constructing AutoTileManager
Bug:
22682394
Change-Id: Ida41d3757b0732a01e9ede92ec8c5d2f8426c6b0
Rubin Xu [Mon, 15 Feb 2016 14:29:59 +0000 (14:29 +0000)]
Merge "Fix typo in filling ACTION_MANAGED_PROFILE_UNLOCKED extras." into nyc-dev
Rubin Xu [Mon, 15 Feb 2016 13:50:18 +0000 (13:50 +0000)]
Fix typo in filling ACTION_MANAGED_PROFILE_UNLOCKED extras.
Change-Id: Ic949a0d7f72d46d7cc36018b4b0fc54024c3b180
Paul Crowley [Mon, 15 Feb 2016 14:04:04 +0000 (14:04 +0000)]
Merge "Send extra argument to unlock_user_keys on non-FBE startup" into nyc-dev
Geoff Mendal [Mon, 15 Feb 2016 13:26:51 +0000 (08:26 -0500)]
Import translations. DO NOT MERGE
Change-Id: Ie2f607c102f9345c68edc8eaca3eb6a73f622f5d
Auto-generated-cl: translation import
Neil Fuller [Mon, 15 Feb 2016 12:05:44 +0000 (12:05 +0000)]
Add flags needed to switch Jack to 1.8 for CTS targets
When linking against .jack files that contain 1.8 language
features Jack (currently) requires -D jack.java.source.version=1.8.
"core-tests" includes 1.8 language features.
Bug:
27113322
Bug:
26953739
Change-Id: Ib9ceaadafc9c1d41ff137c48111ad3b060f7e248
Narayan Kamath [Mon, 15 Feb 2016 11:38:33 +0000 (11:38 +0000)]
Merge "Track libcore change
5731615b4d705b5af63a3126d84b8786862477d." into nyc-dev
Neil Fuller [Mon, 15 Feb 2016 11:16:05 +0000 (11:16 +0000)]
Merge "Add flags needed to switch Jack to 1.8 for CTS targets" into nyc-dev
Narayan Kamath [Mon, 15 Feb 2016 11:07:26 +0000 (11:07 +0000)]
Track libcore change
5731615b4d705b5af63a3126d84b8786862477d.
bug:
26689841
Change-Id: I463543c67cc525583d1fd6f7031a0d38f543d8a2
Nicolas Prévot [Mon, 15 Feb 2016 10:47:40 +0000 (10:47 +0000)]
Merge "Allow privileged apps to set the organization color." into nyc-dev
Bartosz Fabianowski [Mon, 15 Feb 2016 10:02:55 +0000 (10:02 +0000)]
Merge "Remove wifiConfiguration.isVisibleToUser()" into mm-wireless-dev
am:
e1bdbd216f
* commit '
e1bdbd216fef6d1f0bb6b3c61cc95abba3e67af7':
Remove wifiConfiguration.isVisibleToUser()
Bartosz Fabianowski [Mon, 15 Feb 2016 09:56:52 +0000 (09:56 +0000)]
Merge "Remove wifiConfiguration.isVisibleToUser()" into mm-wireless-dev
Paul Crowley [Mon, 15 Feb 2016 06:44:51 +0000 (06:44 +0000)]
Send extra argument to unlock_user_keys on non-FBE startup
Non-FBE startup has a loop which sets up the appropriate lock state
for each user depending on whether FBE is being emulated; this loop
calls unlock_user_keys when emulation is off. I didn't modify this
loop when adding the extra arguemnt to unlock_user_keys.
Bug:
27155768
Change-Id: I825a61552383552eafb88c77c1f30591bdfd077c
Ian Pedowitz [Sun, 14 Feb 2016 23:36:48 +0000 (15:36 -0800)]
Revert "Fix missing observer reply callbacks"
This should not have merged from mnc-dr-dev, the underlying implementation has changed
This reverts commit
dbb75248b19366d76cfdd7d4536d68467e7322c1.
Akshay Thakker [Sun, 14 Feb 2016 22:48:31 +0000 (22:48 +0000)]
Merge "Fix missing observer reply callbacks" into mnc-dr-dev am:
d1811e07d5 am:
a3798d7a92
am:
d6de840957
* commit '
d6de84095735a32e160f5ae9ce93489b0b19eeed':
Fix missing observer reply callbacks
Akshay Thakker [Sun, 14 Feb 2016 22:42:32 +0000 (22:42 +0000)]
Merge "Exit getAllValidScorers early if not the primary." into mnc-dr-dev am:
ae31e13ae8 am:
eae2b8978f
am:
bc45c5e1a3
* commit '
bc45c5e1a35fb248cd327846e0c68f930b64d653':
Exit getAllValidScorers early if not the primary.
Dan Sandler [Sun, 14 Feb 2016 22:41:30 +0000 (22:41 +0000)]
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm. am:
e79c73d626 am:
4baa901205
am:
c644228110 -s ours
* commit '
c64422811060548ac9f754b12b2ce23ed81b1fe0':
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
Akshay Thakker [Sun, 14 Feb 2016 22:37:55 +0000 (22:37 +0000)]
Merge "Fix missing observer reply callbacks" into mnc-dr-dev am:
d1811e07d5
am:
a3798d7a92
* commit '
a3798d7a92ecefe1117b99a2e0f5edce1644f1d0':
Fix missing observer reply callbacks