OSDN Git Service
fenglu [Wed, 22 Apr 2015 01:32:17 +0000 (01:32 +0000)]
Merge "update API name to requestBandwidthUpdate()"
Justin Koh [Wed, 22 Apr 2015 01:07:42 +0000 (01:07 +0000)]
am
59338950: (-s ours) am
ba75135a: am
2aa3905c: Merge "DO NOT MERGE: The ValueAnimator\'s state need to be totally reset during clone." into lmp-mr1-modular-dev
* commit '
593389501fb3f291eb4b1de4b995318c1ac458b0':
DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.
ztenghui [Wed, 22 Apr 2015 01:07:36 +0000 (01:07 +0000)]
am
2947926c: (-s ours) am
059451e1: am
23606598: DO NOT MERGE: Reset the Node status when clone.
* commit '
2947926ce8f15417cebaad936482fc7c18957eaa':
DO NOT MERGE: Reset the Node status when clone.
Justin Koh [Wed, 22 Apr 2015 00:53:38 +0000 (00:53 +0000)]
am
ba75135a: am
2aa3905c: Merge "DO NOT MERGE: The ValueAnimator\'s state need to be totally reset during clone." into lmp-mr1-modular-dev
* commit '
ba75135a807c87f4d6c14e69b1246eabd39f4117':
DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.
ztenghui [Wed, 22 Apr 2015 00:53:34 +0000 (00:53 +0000)]
am
059451e1: am
23606598: DO NOT MERGE: Reset the Node status when clone.
* commit '
059451e18504d6fbbedacaeefe0f2b62b355104d':
DO NOT MERGE: Reset the Node status when clone.
Justin Koh [Wed, 22 Apr 2015 00:43:16 +0000 (00:43 +0000)]
am
2aa3905c: Merge "DO NOT MERGE: The ValueAnimator\'s state need to be totally reset during clone." into lmp-mr1-modular-dev
* commit '
2aa3905cb0cc595783ab43b0bc7a4b3818003958':
DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.
ztenghui [Wed, 22 Apr 2015 00:43:08 +0000 (00:43 +0000)]
am
23606598: DO NOT MERGE: Reset the Node status when clone.
* commit '
23606598244c2a297d994895eaf631b240d33242':
DO NOT MERGE: Reset the Node status when clone.
Vinit Deshpande [Wed, 22 Apr 2015 00:35:28 +0000 (00:35 +0000)]
Merge "Turn of WifiScanner's debug logging"
Justin Koh [Wed, 22 Apr 2015 00:30:59 +0000 (00:30 +0000)]
Merge "DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone." into lmp-mr1-modular-dev
Andreas Gampe [Wed, 22 Apr 2015 00:23:51 +0000 (00:23 +0000)]
am
5b0c0964: am
fb861b6c: am
31fb202e: Merge "Frameworks/base: Compile-time optimize SQLiteConnection"
* commit '
5b0c0964d843319b1b89767cd3d3f1daa984df51':
Frameworks/base: Compile-time optimize SQLiteConnection
Andreas Gampe [Wed, 22 Apr 2015 00:12:30 +0000 (00:12 +0000)]
am
fb861b6c: am
31fb202e: Merge "Frameworks/base: Compile-time optimize SQLiteConnection"
* commit '
fb861b6c8d255fc31f3460e39681a4fee35f156b':
Frameworks/base: Compile-time optimize SQLiteConnection
fenglu [Wed, 22 Apr 2015 00:12:05 +0000 (17:12 -0700)]
update API name to requestBandwidthUpdate()
Change-Id: If26942978ffcc43f06f17dfad5da790f34758395
Mathieu Chartier [Wed, 22 Apr 2015 00:00:23 +0000 (00:00 +0000)]
am
097e1cdf: am
765d7c30: am
ba6783b6: Merge "Update getExportedPropertyMethods to new reflection API"
* commit '
097e1cdfb8f3520b22eafb2f0a7458010b1b3415':
Update getExportedPropertyMethods to new reflection API
Andreas Gampe [Wed, 22 Apr 2015 00:00:15 +0000 (00:00 +0000)]
am
5d3aea2e: am
c7f9f765: am
189d2785: Merge "Frameworks/base: Fix comment"
* commit '
5d3aea2e5d052041a81bf49154ceedb9d96e2918':
Frameworks/base: Fix comment
Andreas Gampe [Tue, 21 Apr 2015 23:59:57 +0000 (23:59 +0000)]
am
31fb202e: Merge "Frameworks/base: Compile-time optimize SQLiteConnection"
* commit '
31fb202e6f6687f86ec4fc33b18aafacbf67c797':
Frameworks/base: Compile-time optimize SQLiteConnection
Robert Greenwalt [Tue, 21 Apr 2015 23:59:34 +0000 (23:59 +0000)]
Merge "Revert "requestBwUpdate() public API review""
Robert Greenwalt [Tue, 21 Apr 2015 23:59:14 +0000 (23:59 +0000)]
Revert "requestBwUpdate() public API review"
This reverts commit
32f21da41031595a315aaf0eb67f6a094365f2b4.
Change-Id: I8c22d285ff1f56f1bd31a0fa9f2e6a79959347b1
Robert Greenwalt [Tue, 21 Apr 2015 23:55:48 +0000 (23:55 +0000)]
Merge "requestBwUpdate() public API review"
Mathieu Chartier [Tue, 21 Apr 2015 23:42:42 +0000 (23:42 +0000)]
am
765d7c30: am
ba6783b6: Merge "Update getExportedPropertyMethods to new reflection API"
* commit '
765d7c304871044eaaa92974c295b52faa6244b0':
Update getExportedPropertyMethods to new reflection API
Andreas Gampe [Tue, 21 Apr 2015 23:42:38 +0000 (23:42 +0000)]
am
c7f9f765: am
189d2785: Merge "Frameworks/base: Fix comment"
* commit '
c7f9f7656fc8d3538adddab75f6b1fc48387a719':
Frameworks/base: Fix comment
Andreas Gampe [Tue, 21 Apr 2015 23:31:51 +0000 (23:31 +0000)]
Merge "Frameworks/base: Compile-time optimize SQLiteConnection"
Sunny Goyal [Tue, 21 Apr 2015 23:28:48 +0000 (23:28 +0000)]
Merge "Updating the default colors for StackView"
Mathieu Chartier [Tue, 21 Apr 2015 23:26:49 +0000 (23:26 +0000)]
am
ba6783b6: Merge "Update getExportedPropertyMethods to new reflection API"
* commit '
ba6783b69a34b05123d1e3da51e6a11a9e0ca115':
Update getExportedPropertyMethods to new reflection API
Andreas Gampe [Tue, 21 Apr 2015 23:26:41 +0000 (23:26 +0000)]
am
189d2785: Merge "Frameworks/base: Fix comment"
* commit '
189d2785c3b71eac9c122c874586501a2ab723b2':
Frameworks/base: Fix comment
Deepanshu Gupta [Tue, 21 Apr 2015 23:09:14 +0000 (23:09 +0000)]
am
a120e9fc: Merge "Add resources to recyclerview dependency." into lmp-mr1-ub-dev
* commit '
a120e9fcc9eb5b19945a99570ec0c6ddd6433560':
Add resources to recyclerview dependency.
Olawale Ogunwale [Tue, 21 Apr 2015 23:09:06 +0000 (23:09 +0000)]
am
8ac2478b: am
f7be8b67: am
fa147b5c: Merge "[ActivityManager] Move UI operation to UI handler"
* commit '
8ac2478b97ccb3f5e94b4df50c935c8f5cdff99c':
[ActivityManager] Move UI operation to UI handler
Olawale Ogunwale [Tue, 21 Apr 2015 23:08:50 +0000 (23:08 +0000)]
am
9e6c83ab: am
acaa886c: am
0408187e: Merge "[ActivityManager] Avoid unnecessary restart provider process"
* commit '
9e6c83abaf59574ed5c1e9934560ea50abe296be':
[ActivityManager] Avoid unnecessary restart provider process
Sunny Goyal [Tue, 21 Apr 2015 22:29:10 +0000 (15:29 -0700)]
Updating the default colors for StackView
Change-Id: I595959cf772741dbb91508fd1e3d938443450ed2
Mathieu Chartier [Tue, 21 Apr 2015 23:03:33 +0000 (23:03 +0000)]
Merge "Update getExportedPropertyMethods to new reflection API"
Vinit Deshpande [Tue, 21 Apr 2015 22:59:53 +0000 (15:59 -0700)]
Turn of WifiScanner's debug logging
Bug:
20416721
Change-Id: I48051dbc0bb6e58279ea5ca5dce90d837f1df4e6
Andreas Gampe [Mon, 20 Apr 2015 22:29:04 +0000 (15:29 -0700)]
Frameworks/base: Compile-time optimize SQLiteConnection
Do not cache compiled regular expression and date formatter. Both
cannot be compile-time created, are expensive at preloading time,
and only used in the rare case of dumping the connection (mainly
on errors).
Bug:
19498458
Bug:
19542228
Change-Id: Ia38491a3f852ccf699b815ff05289b338e932f2a
Ben Kwa [Tue, 21 Apr 2015 22:54:44 +0000 (22:54 +0000)]
Merge "Implement some tests for com.android.documentsui.CopyService."
Ben Kwa [Fri, 17 Apr 2015 01:14:35 +0000 (18:14 -0700)]
Implement some tests for com.android.documentsui.CopyService.
- Add a unit test for CopyService.
- Make some changes to StubProvider to make it more configurable, for
testing.
Change-Id: I3d726099feaf6b7a3fdd40bf2449f4ee3e848d77
Jae Seo [Tue, 21 Apr 2015 22:36:28 +0000 (22:36 +0000)]
Merge "TIF: Cache the stream volume on TvView"
fenglu [Thu, 16 Apr 2015 20:25:47 +0000 (13:25 -0700)]
requestBwUpdate() public API review
Change-Id: I1e780b2705d13bfc85a0a8712ac1dbd623b474a1
ztenghui [Tue, 21 Apr 2015 22:13:01 +0000 (22:13 +0000)]
Merge "Being extra careful, reset some more variables on ValueAnimator."
Alex Klyubin [Tue, 21 Apr 2015 22:11:33 +0000 (22:11 +0000)]
Merge "Document that WebView doesn't honor "uses cleartext traffic" flag."
Jae Seo [Tue, 21 Apr 2015 17:50:59 +0000 (10:50 -0700)]
TIF: Cache the stream volume on TvView
Also added explanation of the default value.
Bug:
18939663
Change-Id: Idffd45738b0299779c245a11022faadc12004060
Alex Klyubin [Tue, 21 Apr 2015 20:44:29 +0000 (13:44 -0700)]
Document that WebView doesn't honor "uses cleartext traffic" flag.
Bug:
19215516
Change-Id: I5dbbaa03f3cae007c0b9b68fcf8cc8f250c16a62
Yorke Lee [Tue, 21 Apr 2015 21:49:30 +0000 (21:49 +0000)]
Merge "Make CAPABILITY_CAN_PAUSE_VIDEO public"
Chris Craik [Tue, 21 Apr 2015 21:47:26 +0000 (21:47 +0000)]
Merge "More state cleanup in View#draw"
Chris Craik [Tue, 21 Apr 2015 21:07:10 +0000 (14:07 -0700)]
More state cleanup in View#draw
bug:
20254728
Change-Id: I988077aac59165dd1fcb3ebbcd5abded586256b5
Christopher Tate [Mon, 20 Apr 2015 23:09:48 +0000 (16:09 -0700)]
Compress the preferred-app backup payloads
They can be Very Very Large, so take advantage of the new BlobBackupHelper
infrastructure to keep them tiny!
Also fix an issue in which the restore path wasn't properly passing
notification payloads along for processing, and an issue in which the
blob helper wasn't handling empty states properly.
Change-Id: I11a7ca3cd2e26f634a8971e874ac97385b0b500c
ztenghui [Fri, 10 Apr 2015 20:14:17 +0000 (13:14 -0700)]
DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.
b/
20119270
Change-Id: I26365b38e4a9712227aaec6f08f32025dab82ac7
(cherry picked from commit
26e9a19900bae56b012425a114685d42dfa2fde1)
ztenghui [Tue, 21 Apr 2015 21:17:00 +0000 (14:17 -0700)]
Being extra careful, reset some more variables on ValueAnimator.
No real bug found related to these set of variables yet, just a clean up.
b/
20457797
Change-Id: I8443718b1c289ccc87e6b227d417825838277361
Jinsuk Kim [Tue, 21 Apr 2015 21:12:29 +0000 (21:12 +0000)]
Merge "CEC: Prevent premature standby process completion"
ztenghui [Tue, 21 Apr 2015 21:03:10 +0000 (21:03 +0000)]
Merge "Reset the Node status when clone."
Mike Lockwood [Tue, 21 Apr 2015 20:46:52 +0000 (20:46 +0000)]
Merge "BluetoothMidiService: Use MidiBtleTimeTracker to interpret incoming Bluetooth MIDI timestamps"
Yorke Lee [Tue, 21 Apr 2015 20:42:24 +0000 (13:42 -0700)]
Make CAPABILITY_CAN_PAUSE_VIDEO public
Change-Id: If20f642a3d6bda886a68bb1e0ce459c38361a73c
Rachad [Tue, 21 Apr 2015 20:39:15 +0000 (20:39 +0000)]
Merge "Fix Build:"
Jeff Brown [Tue, 21 Apr 2015 20:38:13 +0000 (20:38 +0000)]
Merge "Make activity manager sleep top activity when dreaming."
ztenghui [Tue, 21 Apr 2015 20:00:08 +0000 (13:00 -0700)]
DO NOT MERGE: Reset the Node status when clone.
b/
20457797
Change-Id: I5f1b0e2238fdc4a69a9c09c1e6e0272f7ede3685
Rachad [Tue, 21 Apr 2015 20:28:54 +0000 (13:28 -0700)]
Fix Build:
Add overloaded AudioTrack.write() to api/current.txt and api/system-current.txt
Change-Id: I5982e3c19c74dcde1df745137a9eed8ec32efa6a
Mike Lockwood [Tue, 21 Apr 2015 16:33:09 +0000 (09:33 -0700)]
BluetoothMidiService: Use MidiBtleTimeTracker to interpret incoming Bluetooth MIDI timestamps
Also fixed some problems handling timestamp wrapping.
Change-Id: Ic0aefc54f2560425bea6d07ca0c4529d16699eaa
ztenghui [Tue, 21 Apr 2015 20:00:08 +0000 (13:00 -0700)]
Reset the Node status when clone.
b/
20457797
Change-Id: I5f1b0e2238fdc4a69a9c09c1e6e0272f7ede3685
Svet Ganov [Tue, 21 Apr 2015 19:52:10 +0000 (19:52 +0000)]
Merge "Add OP_READ_PHONE_STATE app op continued - framework"
Adrian Roos [Tue, 21 Apr 2015 19:47:42 +0000 (19:47 +0000)]
Merge "Clear emergency dialer task on launch"
Jeff Sharkey [Tue, 21 Apr 2015 19:44:59 +0000 (19:44 +0000)]
Merge "Blend in force adoptable flag when set."
Adrian Roos [Mon, 20 Apr 2015 20:57:06 +0000 (13:57 -0700)]
Clear emergency dialer task on launch
Bug:
20344056
Change-Id: Ic26f003acad3f9f91d772e5b4be8bd4b8aff5ec8
Rachad [Tue, 21 Apr 2015 19:29:43 +0000 (19:29 +0000)]
Merge "AudioTrack.write() with timestamp support"
Jeff Sharkey [Tue, 21 Apr 2015 19:14:03 +0000 (12:14 -0700)]
Blend in force adoptable flag when set.
Bug:
19993667
Change-Id: Ic7f348d171a89e889281b7efb1aa0cbade048975
Mathieu Chartier [Fri, 17 Apr 2015 19:49:57 +0000 (12:49 -0700)]
Update getExportedPropertyMethods to new reflection API
Bug:
19264997
Change-Id: Ife79c469fdb09f30e3aefcfc3e0ce5ed32303fce
Deepanshu Gupta [Tue, 21 Apr 2015 18:31:39 +0000 (18:31 +0000)]
Merge "Add resources to recyclerview dependency."
Deepanshu Gupta [Fri, 17 Apr 2015 00:58:37 +0000 (17:58 -0700)]
Add resources to recyclerview dependency.
Change-Id: I03c1dbacf8c83149de3ee01fe6d7dbb288d1948a
(cherry picked from commit
202cbbe45383b871129743d55179cf1c6429fffc)
Jim Miller [Tue, 21 Apr 2015 17:45:51 +0000 (17:45 +0000)]
Merge "Make fingerprint enroll/authenticate haptic feedback part of framework."
Deepanshu Gupta [Tue, 21 Apr 2015 17:34:11 +0000 (17:34 +0000)]
Merge "Add resources to recyclerview dependency." into lmp-mr1-ub-dev
Chris Wren [Tue, 21 Apr 2015 17:24:30 +0000 (17:24 +0000)]
Merge "Add optional package context to sysui action metrics."
Chris Wren [Tue, 21 Apr 2015 16:34:02 +0000 (12:34 -0400)]
Add optional package context to sysui action metrics.
Bug:
20451514
Change-Id: I3c671d9aa05e02d66168211b77128443c544609d
Dan Sandler [Wed, 15 Apr 2015 15:02:54 +0000 (11:02 -0400)]
Rediscover your own notifications.
This new API, NotificationManager.getActiveNotifications(),
allows an app to recover the set of notifications it has
posted that are still active (un-cleared, un-canceled,
visible by the user). Along with the Notification object
you'll get the original tag and id you used to post it,
wrapped up in the somewhat awkwardly-named
StatusBarNotification data structure (previously only used
internally by NoMan/SysUI and NotificationListenerServices).
Bug:
17320461
Change-Id: I8cd610956fafed4e31526b663cebdc31231ad930
Andrei Kapishnikov [Tue, 21 Apr 2015 16:38:05 +0000 (16:38 +0000)]
Merge "Introduced DO_NOT_ASK_CREDENTIALS_ON_BOOT flag"
Chris Craik [Tue, 21 Apr 2015 16:30:07 +0000 (16:30 +0000)]
Merge "Rename native DisplayListRenderer to DisplayListCanvas"
Jae Seo [Tue, 21 Apr 2015 16:13:01 +0000 (16:13 +0000)]
Merge "TIF: Fix incorrect uses of INPUT_STATE_XXX"
Jae Seo [Mon, 20 Apr 2015 22:37:50 +0000 (15:37 -0700)]
TIF: Fix incorrect uses of INPUT_STATE_XXX
Also changed TvInputManager.getTvInputState to return
INPUT_STATE_DISCONNECTED for removed inputs and fixed documentation.
Bug:
18563677, Bug:
20435950
Change-Id: Idb81cee852b797eb3f5113d68468905f327928e7
Andreas Gampe [Tue, 21 Apr 2015 16:10:26 +0000 (16:10 +0000)]
Merge "Frameworks/base: Fix comment"
Olawale Ogunwale [Tue, 21 Apr 2015 16:08:49 +0000 (16:08 +0000)]
am
f7be8b67: am
fa147b5c: Merge "[ActivityManager] Move UI operation to UI handler"
* commit '
f7be8b6739f174919ad01dcd32788b1b67c6820a':
[ActivityManager] Move UI operation to UI handler
Olawale Ogunwale [Tue, 21 Apr 2015 16:08:45 +0000 (16:08 +0000)]
am
acaa886c: am
0408187e: Merge "[ActivityManager] Avoid unnecessary restart provider process"
* commit '
acaa886ce765c58c1e71b440b623a16ae419f5da':
[ActivityManager] Avoid unnecessary restart provider process
Wei Jia [Tue, 21 Apr 2015 16:02:57 +0000 (16:02 +0000)]
Merge "MediaSync: update code example for setCallback."
Andreas Gampe [Tue, 21 Apr 2015 16:01:51 +0000 (09:01 -0700)]
Frameworks/base: Fix comment
Fix comment in ZygoteInit.
Change-Id: I853581c8d44ee52ee8e113c67ea68621643ecb39
Luan Nguyen [Tue, 21 Apr 2015 15:59:24 +0000 (15:59 +0000)]
am
2da31b1e: am
886e8e11: am
2fdd83a9: am
d2545775: am
4c20df0b: am
4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '
2da31b1ef75f239ee33fea4592cbf0159a0af8b4':
docs: Add Channel API summary for Wear.
Olawale Ogunwale [Tue, 21 Apr 2015 15:53:53 +0000 (15:53 +0000)]
am
fa147b5c: Merge "[ActivityManager] Move UI operation to UI handler"
* commit '
fa147b5caf7b44f76aee515afecda639fbc52c22':
[ActivityManager] Move UI operation to UI handler
Olawale Ogunwale [Tue, 21 Apr 2015 15:53:45 +0000 (15:53 +0000)]
am
0408187e: Merge "[ActivityManager] Avoid unnecessary restart provider process"
* commit '
0408187e7d2e7bdb6d0cb0521f49859a3d9a7396':
[ActivityManager] Avoid unnecessary restart provider process
Luan Nguyen [Tue, 21 Apr 2015 15:47:42 +0000 (15:47 +0000)]
am
886e8e11: am
2fdd83a9: am
d2545775: am
4c20df0b: am
4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '
886e8e1137fa7acad558c297891e61c20b43b036':
docs: Add Channel API summary for Wear.
Craig Mautner [Tue, 21 Apr 2015 15:41:26 +0000 (15:41 +0000)]
am
da506ffa: am
14818725: am
80f99121: Merge "Prevent infinite layout and wallpaper flashing"
* commit '
da506ffabadd551241e23aecf08e378e7d0f30b1':
Prevent infinite layout and wallpaper flashing
Luan Nguyen [Tue, 21 Apr 2015 15:35:41 +0000 (15:35 +0000)]
am
2fdd83a9: am
d2545775: am
4c20df0b: am
4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '
2fdd83a97a0dd3de36264928ff42dcc0a098018f':
docs: Add Channel API summary for Wear.
Olawale Ogunwale [Tue, 21 Apr 2015 15:31:58 +0000 (15:31 +0000)]
Merge "[ActivityManager] Move UI operation to UI handler"
Joseph Cooper [Tue, 21 Apr 2015 15:31:41 +0000 (15:31 +0000)]
Merge "Introduces navigation keycodes."
riddle_hsu [Thu, 16 Apr 2015 04:45:48 +0000 (12:45 +0800)]
[ActivityManager] Move UI operation to UI handler
Because ANR will dump cpu usage, stack traces in ActivityManager
thread, if system is busy or in low-end device, it may spend more
than 5s to dump. So when there is UI operation (e.g. pop dialog)
in ActivityManager thread, it may meet key dispatch timeout.
Change-Id: Ie550e31a7cff65bdcfc9af2c32989e9deb5fb2cf
Craig Mautner [Tue, 21 Apr 2015 15:30:44 +0000 (15:30 +0000)]
am
14818725: am
80f99121: Merge "Prevent infinite layout and wallpaper flashing"
* commit '
148187255ecaaaf6a35920f779fa6a171433ccd4':
Prevent infinite layout and wallpaper flashing
Olawale Ogunwale [Tue, 21 Apr 2015 15:29:09 +0000 (15:29 +0000)]
Merge "[ActivityManager] Avoid unnecessary restart provider process"
Luan Nguyen [Tue, 21 Apr 2015 15:24:36 +0000 (15:24 +0000)]
am
d2545775: am
4c20df0b: am
4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '
d2545775568694c75c9589eaf7c894583e37de4e':
docs: Add Channel API summary for Wear.
Craig Mautner [Tue, 21 Apr 2015 15:19:06 +0000 (15:19 +0000)]
am
80f99121: Merge "Prevent infinite layout and wallpaper flashing"
* commit '
80f99121ea96cdabea6260ab165e7183431be513':
Prevent infinite layout and wallpaper flashing
Luan Nguyen [Tue, 21 Apr 2015 15:12:51 +0000 (15:12 +0000)]
am
4c20df0b: am
4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '
4c20df0bbec2774e8829245547cfe8a42c5faea7':
docs: Add Channel API summary for Wear.
Andrei Kapishnikov [Thu, 2 Apr 2015 19:21:20 +0000 (15:21 -0400)]
Introduced DO_NOT_ASK_CREDENTIALS_ON_BOOT flag
A new flag for DPM.resetPassword() method that specifies that the
device should be decrypted without asking for the password or pattern.
Bug
19250601
Related CL in Settings App: https://googleplex-android-review.git.corp.google.com/#/c/670206
Change-Id: I9ca3472dc18e66e618ff772dee16ca4a450e9997
Luan Nguyen [Tue, 21 Apr 2015 15:00:56 +0000 (15:00 +0000)]
am
4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '
4aebbfbb9ba54d77ac99508fb66db6c9fd24343a':
docs: Add Channel API summary for Wear.
Craig Mautner [Tue, 21 Apr 2015 14:54:42 +0000 (14:54 +0000)]
Merge "Prevent infinite layout and wallpaper flashing"
Luan Nguyen [Tue, 21 Apr 2015 14:53:02 +0000 (14:53 +0000)]
Merge "docs: Add Channel API summary for Wear." into lmp-docs
Dan Sandler [Tue, 21 Apr 2015 14:31:39 +0000 (14:31 +0000)]
Merge "Fix build."
Robin Lee [Tue, 21 Apr 2015 14:30:54 +0000 (14:30 +0000)]
Merge "SecurityController: track VPN for all users"
Robin Lee [Thu, 16 Apr 2015 16:01:49 +0000 (17:01 +0100)]
SecurityController: track VPN for all users
Fixes inconsistencies when switching users.
Bug:
17763561
Bug:
17506956
Bug:
18419023
Change-Id: I65988e6c45afd00a402d1e266922d5648fd12743
Dan Sandler [Tue, 21 Apr 2015 14:24:32 +0000 (10:24 -0400)]
Fix build.
Change-Id: I0e419fdb36cedba67fc6da7f71134d9728f66150