OSDN Git Service
Ashutosh Joshi [Wed, 27 Apr 2016 18:19:16 +0000 (11:19 -0700)]
Add state for loading/unloading apps
Add state for loading/unloading nanoApps.
Pass on OS response to ContextHubService clients.
Bug:
29193948
Change-Id: I700f3bdbb8e84413455751dec02a812a639421b3
Chris Tate [Tue, 12 Jul 2016 21:00:28 +0000 (21:00 +0000)]
Merge "Harden framework against backup transport crashes" into nyc-mr1-dev
Anthony Hugh [Tue, 12 Jul 2016 20:39:04 +0000 (20:39 +0000)]
Merge "Prevent back button from being handled by app after waking device" into nyc-mr1-dev
Sudheer Shanka [Tue, 12 Jul 2016 20:01:06 +0000 (20:01 +0000)]
Merge \\\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\\" into lmp-mr1-dev am:
d327d73edf am:
cb7e0643c9 am:
76c9d70756 -s ours am:
6ae7a5f72b am:
322e70cef3 am:
a730e5977e am:
cbe258aa27 -s ours
am:
5b28589127
Change-Id: I1a8bfc2b3acb05edea636ba0c2e1eabaa83d8acb
Sudheer Shanka [Tue, 12 Jul 2016 20:01:04 +0000 (20:01 +0000)]
Merge \\\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\\" into lmp-mr1-dev am:
f1d9152f9f am:
177422c91e am:
fd0757f195 -s ours am:
7975dd5b48 am:
008d66e49c am:
e8458d8f88 am:
1bb51deaf4 -s ours
am:
5441a248f4
Change-Id: Ib4f04849819432248e069997659215ecf2840e67
Sudheer Shanka [Tue, 12 Jul 2016 19:52:48 +0000 (19:52 +0000)]
Merge \\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\" into lmp-mr1-dev am:
d327d73edf am:
cb7e0643c9 am:
76c9d70756 -s ours am:
6ae7a5f72b am:
322e70cef3 am:
a730e5977e
am:
cbe258aa27 -s ours
Change-Id: I1cd45ce38ea1859fef073124cd3362076b2c33e4
Sudheer Shanka [Tue, 12 Jul 2016 19:52:44 +0000 (19:52 +0000)]
Merge \\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\" into lmp-mr1-dev am:
f1d9152f9f am:
177422c91e am:
fd0757f195 -s ours am:
7975dd5b48 am:
008d66e49c am:
e8458d8f88
am:
1bb51deaf4 -s ours
Change-Id: I82e3b82dd260fef67e4c17156d9a868771e70e61
Sudheer Shanka [Tue, 12 Jul 2016 19:47:49 +0000 (19:47 +0000)]
Merge \\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\" into lmp-mr1-dev am:
d327d73edf am:
cb7e0643c9 am:
76c9d70756 -s ours am:
6ae7a5f72b am:
322e70cef3
am:
a730e5977e
Change-Id: Ic3f93423fed99fe6e1b1142e9f949866897954ae
Sudheer Shanka [Tue, 12 Jul 2016 19:47:44 +0000 (19:47 +0000)]
Merge \\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\" into lmp-mr1-dev am:
f1d9152f9f am:
177422c91e am:
fd0757f195 -s ours am:
7975dd5b48 am:
008d66e49c
am:
e8458d8f88
Change-Id: If984b3437bc60d99e693907aef24f3b7b1218836
Sudheer Shanka [Tue, 12 Jul 2016 19:42:40 +0000 (19:42 +0000)]
Merge \\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\" into lmp-mr1-dev am:
d327d73edf am:
cb7e0643c9 am:
76c9d70756 -s ours am:
6ae7a5f72b
am:
322e70cef3
Change-Id: I8c18ad1a029c13f1be022e12031f29d3cbba2220
Sudheer Shanka [Tue, 12 Jul 2016 19:42:38 +0000 (19:42 +0000)]
Merge \\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\" into lmp-mr1-dev am:
f1d9152f9f am:
177422c91e am:
fd0757f195 -s ours am:
7975dd5b48
am:
008d66e49c
Change-Id: I18ca4b24a2e18b122106027568cb92e3a10822ca
Sudheer Shanka [Tue, 12 Jul 2016 19:34:39 +0000 (19:34 +0000)]
Merge \\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\" into lmp-mr1-dev am:
d327d73edf am:
cb7e0643c9 am:
76c9d70756 -s ours
am:
6ae7a5f72b
Change-Id: I89dd8c81075ebc85173c5fc37e8a4d1dfe312bbb
Sudheer Shanka [Tue, 12 Jul 2016 19:34:38 +0000 (19:34 +0000)]
Merge \\\\"DO NOT MERGE: Reduce shell power over user management.\\\\" into lmp-mr1-dev am:
f1d9152f9f am:
177422c91e am:
fd0757f195 -s ours
am:
7975dd5b48
Change-Id: I343863180866b38af4f91a6f79068c21096e7ce0
Sudheer Shanka [Tue, 12 Jul 2016 19:27:39 +0000 (19:27 +0000)]
Merge \\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\" into lmp-mr1-dev am:
d327d73edf am:
cb7e0643c9
am:
76c9d70756 -s ours
Change-Id: I860be1d599fe60603b37ba8388a20c44c37d6f68
Sudheer Shanka [Tue, 12 Jul 2016 19:27:37 +0000 (19:27 +0000)]
Merge \\\"DO NOT MERGE: Reduce shell power over user management.\\\" into lmp-mr1-dev am:
f1d9152f9f am:
177422c91e
am:
fd0757f195 -s ours
Change-Id: I17b97d1cfefa769b07ea798c6f87f8af22a31329
Sudheer Shanka [Tue, 12 Jul 2016 19:20:38 +0000 (19:20 +0000)]
Merge \\"DO NOT MERGE: Add pm operation to set user restrictions.\\" into lmp-mr1-dev am:
d327d73edf
am:
cb7e0643c9
Change-Id: I42d732fcc3ed8745dcc35e433e066ee8babe3e42
Sudheer Shanka [Tue, 12 Jul 2016 19:20:34 +0000 (19:20 +0000)]
Merge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-mr1-dev am:
f1d9152f9f
am:
177422c91e
Change-Id: I7de2c4181d5b42e505310b4639eb82719ae42c16
Jason Monk [Tue, 12 Jul 2016 19:18:50 +0000 (19:18 +0000)]
Merge "SysUI: Protect against crash in BatteryController" into nyc-mr1-dev
TreeHugger Robot [Tue, 12 Jul 2016 19:18:07 +0000 (19:18 +0000)]
Merge "Don't hold a lock while loading default wallpaper" into nyc-mr1-dev
Sudheer Shanka [Tue, 12 Jul 2016 19:11:37 +0000 (19:11 +0000)]
Merge \"DO NOT MERGE: Add pm operation to set user restrictions.\" into lmp-mr1-dev
am:
d327d73edf
Change-Id: I131a01fb8d4ccd440a7727df2fde0ce433bc30d1
Sudheer Shanka [Tue, 12 Jul 2016 19:11:35 +0000 (19:11 +0000)]
Merge \"DO NOT MERGE: Reduce shell power over user management.\" into lmp-mr1-dev
am:
f1d9152f9f
Change-Id: I61633ebe7944d54f3da36eedaf4bab7308ff3c96
Sudheer Shanka [Tue, 12 Jul 2016 19:03:18 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: Add pm operation to set user restrictions." into lmp-mr1-dev
Sudheer Shanka [Tue, 12 Jul 2016 19:03:12 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: Reduce shell power over user management." into lmp-mr1-dev
Chris Tate [Tue, 12 Jul 2016 18:56:45 +0000 (18:56 +0000)]
Merge "Back up / restore lock wallpapers" into nyc-mr1-dev
Chris Tate [Tue, 12 Jul 2016 18:56:24 +0000 (18:56 +0000)]
Merge "Don't walk mutexed collections outside the mutex" into nyc-mr1-dev
Chris Tate [Tue, 12 Jul 2016 18:56:19 +0000 (18:56 +0000)]
Merge "Fix up mangled SELinux labeling of wallpaper files" into nyc-mr1-dev
Christopher Tate [Tue, 28 Jun 2016 23:38:40 +0000 (16:38 -0700)]
Back up / restore lock wallpapers
If writing both system + lock wallpapers winds up hitting the
transport-defined quota, the next backup operation steps back
to storing only the system wallpaper.
Also makes sure to unbind full-backup target agents following
the backup operation. In practice this usually doesn't matter
because the target gets killed following the operation, but
the wallpaper agent runs in the system process where this does
not happen, so was mistakenly being left in place and reused
for the next operation, failing to re-run the full create +
backup lifecycle.
Bug
28968107
Change-Id: I219c2ddd7e899a430ef4cf693b1259464c15eed5
Alan Viverette [Tue, 12 Jul 2016 18:13:20 +0000 (18:13 +0000)]
Merge "Set up view state before attaching, jump drawables if needed" into nyc-mr1-dev
Kevin Hufnagle [Tue, 12 Jul 2016 17:54:26 +0000 (17:54 +0000)]
Merge \"docs: Removed self-referencing links on Apps and Games pages.\" into nyc-dev
am:
4c8d924d4c
Change-Id: I84f8209ce4c1f2a85c02398b3e7e7c30953cefd3
Kevin Hufnagle [Tue, 12 Jul 2016 17:49:09 +0000 (17:49 +0000)]
Merge "docs: Removed self-referencing links on Apps and Games pages." into nyc-dev
Android Build Merger (Role) [Tue, 12 Jul 2016 17:47:24 +0000 (17:47 +0000)]
Merge "Merge \"Include new constant for encryption status in the getter\'s javadoc\" into nyc-dev am:
e278cf7665" into nyc-mr1-dev
Julia Reynolds [Tue, 12 Jul 2016 17:47:20 +0000 (17:47 +0000)]
Merge "Improve jank on header change." into nyc-mr1-dev
Amith Yamasani [Tue, 12 Jul 2016 17:46:58 +0000 (17:46 +0000)]
Merge \"Include new constant for encryption status in the getter\'s javadoc\" into nyc-dev
am:
e278cf7665
Change-Id: I22c884f8982d3a1aaf7baf1b981a3d3d8d8ab624
Amith Yamasani [Tue, 12 Jul 2016 17:40:12 +0000 (17:40 +0000)]
Merge "Include new constant for encryption status in the getter's javadoc" into nyc-dev
Fyodor Kupolov [Tue, 12 Jul 2016 17:32:08 +0000 (10:32 -0700)]
Don't hold a lock while loading default wallpaper
It currently causes lock contention during user switch, when instance of
WallpaperManager in SystemUI is accessed from multiple threads
Bug:
29039588
Change-Id: I4b827d54d10fbd3b188fb94f47e78a2967ecb480
Jason Monk [Tue, 12 Jul 2016 17:34:12 +0000 (13:34 -0400)]
SysUI: Protect against crash in BatteryController
Change-Id: I850177b961b59b342dde4dbf67c018ac68a42960
Fixes:
30033957
Geoffrey Pitsch [Tue, 12 Jul 2016 17:29:55 +0000 (17:29 +0000)]
Merge "OpenSL-based audio support for BootAnimation" into nyc-mr1-dev
Makoto Onuki [Tue, 12 Jul 2016 17:09:31 +0000 (17:09 +0000)]
Merge "Throw ActivityNotFoundException when failed to launch shortcut" into nyc-mr1-dev
Julia Reynolds [Tue, 12 Jul 2016 15:30:28 +0000 (11:30 -0400)]
Improve jank on header change.
Also fix expand icon ripple.
Bug:
30070005
Change-Id: I0a139778f14d5ba4ebee6e27a321af3827ecbe96
Rubin Xu [Tue, 12 Jul 2016 16:37:54 +0000 (16:37 +0000)]
Merge "Guard against null object in scheduleNotifyUpdateAppWidgetLocked" into nyc-mr1-dev
Brad Ebinger [Tue, 12 Jul 2016 16:33:41 +0000 (16:33 +0000)]
Merge "Add Group Id to PhoneAccount" into nyc-mr1-dev
Bill Yi [Tue, 12 Jul 2016 16:29:30 +0000 (16:29 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
a2e1bb8c3e -s ours
Change-Id: Iff3609179536b7e76d0f2a0b221636d86f7b6a51
Bill Yi [Tue, 12 Jul 2016 16:29:28 +0000 (16:29 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
84c67fa304 -s ours
Change-Id: I8da6418636bc11f64c226c8c3d995f7440ed04f7
Joe Fernandez [Tue, 12 Jul 2016 16:29:25 +0000 (16:29 +0000)]
Merge \"docs: July 2016 Dashboard update\" into nyc-dev
am:
ba64d0ec2e
Change-Id: Idc78d3c900d6aef1ff78183bd3f187def98aed0c
TreeHugger Robot [Tue, 12 Jul 2016 16:19:06 +0000 (16:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 12 Jul 2016 16:11:59 +0000 (16:11 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 12 Jul 2016 16:11:41 +0000 (16:11 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 12 Jul 2016 16:11:24 +0000 (16:11 +0000)]
Merge "Merge \"App launch - Test app changes\" into nyc-dev am:
8fabbb89c0" into nyc-mr1-dev
TreeHugger Robot [Tue, 12 Jul 2016 16:11:11 +0000 (16:11 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Gopinath [Tue, 12 Jul 2016 16:11:01 +0000 (16:11 +0000)]
Merge \"App launch - Test app changes\" into nyc-dev
am:
8fabbb89c0
Change-Id: I0b14fe4a4dd9414d9fe9d15980e8058a7b3d9e29
TreeHugger Robot [Tue, 12 Jul 2016 16:10:11 +0000 (16:10 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Joe Fernandez [Tue, 12 Jul 2016 16:09:53 +0000 (16:09 +0000)]
Merge "docs: July 2016 Dashboard update" into nyc-dev
Joe Fernandez [Tue, 12 Jul 2016 16:06:29 +0000 (09:06 -0700)]
docs: July 2016 Dashboard update
Change-Id: Ia2c6488340e7d17696ffe67ba120cb30bea94717
Gopinath Elanchezhian [Tue, 12 Jul 2016 16:02:42 +0000 (16:02 +0000)]
Merge "App launch - Test app changes" into nyc-dev
Chris Wren [Tue, 12 Jul 2016 15:16:03 +0000 (15:16 +0000)]
Merge "also log details for neko rename events" into nyc-mr1-dev
Rubin Xu [Tue, 12 Jul 2016 15:05:59 +0000 (16:05 +0100)]
Guard against null object in scheduleNotifyUpdateAppWidgetLocked
Bug:
30085290
Change-Id: I4f12e1def98dff7e50b4d25a7d23e81bdbe0b7bd
Mahaver Chopra [Tue, 12 Jul 2016 09:48:00 +0000 (09:48 +0000)]
Merge "Add an api to verify if ro.device_owner was set" into nyc-mr1-dev
Bill Yi [Tue, 12 Jul 2016 06:31:19 +0000 (23:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia5d623d602d07244fd92716ff53a126a6ccc299d
Auto-generated-cl: translation import
Bill Yi [Tue, 12 Jul 2016 06:21:45 +0000 (23:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I336a5cd0babcb768a62375cb8d63afa7a7d9532c
Auto-generated-cl: translation import
Bill Yi [Tue, 12 Jul 2016 06:19:08 +0000 (23:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie2c78f0ee8cc349517b13826856b6648bbb29461
Auto-generated-cl: translation import
Bill Yi [Tue, 12 Jul 2016 06:04:28 +0000 (23:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I59f3cb6bc56b5bb55e32ea870b875ab30c8bd28d
Auto-generated-cl: translation import
Hugo Benichi [Mon, 11 Jul 2016 02:05:12 +0000 (11:05 +0900)]
ConnectivityService dump: add apps blocked logs
This patch adds NetworkInfo BLOCKED/UNBLOCKED status of apps to
ConnectivityService's dump logs.
The BLOCKED or UNBLOCKED status of an app is logged with the app uid
when the app calls getActiveNetworkInfo().
Examples:
mNetworkInfoBlockingLogs (most recent first):
07-11 11:04:43.139 - BLOCKED 10060
07-11 11:04:39.056 - UNBLOCKED 10061
07-11 11:04:38.851 - BLOCKED 10061
Bug:
29981766
Change-Id: I6e2fde446702b92b0964ed894409b5d733d8f8a7
Sudheer Shanka [Thu, 9 Jun 2016 00:13:24 +0000 (17:13 -0700)]
DO NOT MERGE: Reduce shell power over user management.
Remove MANAGE_USERS permission from shell and whitelist it for
some specific functionality.
Bug:
29189712
Change-Id: Ifb37448c091af91991964511e3efb1bb4dea1ff3
Sudheer Shanka [Thu, 16 Jun 2016 15:58:00 +0000 (08:58 -0700)]
DO NOT MERGE: Add pm operation to set user restrictions.
Bug:
29189712
Change-Id: I6fdb3b68dfe3f51119e5ce8008880fc7d9c793df
Bert McMeen [Tue, 12 Jul 2016 00:56:33 +0000 (00:56 +0000)]
Merge \\\"Docs: Release Notes for Dev Preview 2\\\" into mnc-io-docs am:
b039c753f3 am:
40df51ce20
am:
3ed7666f03
Change-Id: I568f07a35d75a5e8762e9c117a4d1b02e03e9cc0
Bert McMeen [Tue, 12 Jul 2016 00:50:19 +0000 (00:50 +0000)]
Merge \\"Docs: Release Notes for Dev Preview 2\\" into mnc-io-docs am:
b039c753f3
am:
40df51ce20
Change-Id: I2d698e096a81093a8471dcd3dcf1994986c29a97
Bert McMeen [Tue, 12 Jul 2016 00:45:11 +0000 (00:45 +0000)]
Merge \"Docs: Release Notes for Dev Preview 2\" into mnc-io-docs
am:
b039c753f3
Change-Id: I39f6735f53186f6cb03036a3c7731ca06449acf1
Bert McMeen [Tue, 12 Jul 2016 00:35:07 +0000 (00:35 +0000)]
Merge "Docs: Release Notes for Dev Preview 2" into mnc-io-docs
Bert McMeen [Tue, 12 Jul 2016 00:29:21 +0000 (00:29 +0000)]
Merge \\\"Docs: Information on OTA updates\\\" into mnc-io-docs am:
2f297621a1 am:
1dee5f4dbe
am:
d8c8d710b7
Change-Id: Id6f1de1dae8ee617518b9a8c656379d8dd93f0a0
Bert McMeen [Tue, 12 Jul 2016 00:24:17 +0000 (00:24 +0000)]
Merge \\"Docs: Information on OTA updates\\" into mnc-io-docs am:
2f297621a1
am:
1dee5f4dbe
Change-Id: Ie1685c1393e740fb7d44ef8dbb714ed408eb4319
Bert McMeen [Fri, 24 Jun 2016 21:55:12 +0000 (14:55 -0700)]
Docs: Release Notes for Dev Preview 2
Bug:
29419006
Change-Id: I24f9aa03db1150ab303fa222009f888e0e4cb01d
Bert McMeen [Tue, 12 Jul 2016 00:18:48 +0000 (00:18 +0000)]
Merge \"Docs: Information on OTA updates\" into mnc-io-docs
am:
2f297621a1
Change-Id: I766877a188e5878001da9ffe91d2f09f49e8f3ee
Bert McMeen [Tue, 12 Jul 2016 00:14:47 +0000 (00:14 +0000)]
Merge "Docs: Information on OTA updates" into mnc-io-docs
Amit Mahajan [Tue, 12 Jul 2016 00:03:08 +0000 (00:03 +0000)]
Merge "Disable using SIM language for Chunghwa Telecom and Far EasTone." into nyc-mr1-dev
TreeHugger Robot [Mon, 11 Jul 2016 23:50:27 +0000 (23:50 +0000)]
Merge "Cleanup whole preloads directory" into nyc-mr1-dev
Kevin Hufnagle [Mon, 11 Jul 2016 23:48:35 +0000 (16:48 -0700)]
docs: Removed self-referencing links on Apps and Games pages.
The "Distribute > Stories > Apps" and "Distribute > Stories > Games"
pages on DAC included cards that linked to the current page (in
other words, they were circular/self-referencing links).
Removed the metadata from the apps.html and games.html pages
accordingly.
Bug:
29881467
Change-Id: I2b6555ee565500e978ba3c4edef4d93b0bf9a239
Android Build Merger (Role) [Mon, 11 Jul 2016 23:45:51 +0000 (23:45 +0000)]
Merge "Merge \\\"Docs: Changed Blank Activity to Basic Activity\\\" into mnc-io-docs am:
93dd99c6aa am:
92c664b13d am:
e9ec18cd9f" into nyc-mr1-dev
Hemal Patel [Mon, 11 Jul 2016 23:45:25 +0000 (23:45 +0000)]
Merge \\\"Docs: Changed Blank Activity to Basic Activity\\\" into mnc-io-docs am:
93dd99c6aa am:
92c664b13d
am:
e9ec18cd9f
Change-Id: Idff4581451ed551bd875d493715f41d6dc922a9e
Bert McMeen [Wed, 22 Jun 2016 00:01:31 +0000 (17:01 -0700)]
Docs: Information on OTA updates
Bug:
29545156
Change-Id: I557205fe9c1990d0dbfc020e20f610dae80bbcc5
Chris Tate [Mon, 11 Jul 2016 23:43:51 +0000 (23:43 +0000)]
Merge "Don't force fstrim on OTA" into nyc-mr1-dev
Hemal Patel [Mon, 11 Jul 2016 23:37:22 +0000 (23:37 +0000)]
Merge \\\"Docs: Replaced fill_parent with match_parent\\\" into mnc-io-docs am:
1b72b7955d am:
202bfb4fc7
am:
79a3f25ce4
Change-Id: I6fb357788a646c427164d4b6996f2ca1c834b43f
Hemal Patel [Mon, 11 Jul 2016 23:32:21 +0000 (23:32 +0000)]
Merge \\"Docs: Changed Blank Activity to Basic Activity\\" into mnc-io-docs am:
93dd99c6aa
am:
92c664b13d
Change-Id: I52034f812994545893e6e4e8a9de9de79f593bb2
Vladislav Kaznacheev [Mon, 11 Jul 2016 23:26:31 +0000 (23:26 +0000)]
Merge \"Fix docs for DragEvent\" into nyc-dev
am:
b6fa207c67
Change-Id: I7acfd89bb3cd51273007d8dc7b899ae6b95c7937
Hemal Patel [Mon, 11 Jul 2016 23:26:09 +0000 (23:26 +0000)]
Merge \\"Docs: Replaced fill_parent with match_parent\\" into mnc-io-docs am:
1b72b7955d
am:
202bfb4fc7
Change-Id: Ie5faab93a9c417f6191bb0855dd3ad9326f0c955
Hemal Patel [Mon, 11 Jul 2016 23:25:59 +0000 (23:25 +0000)]
Merge \"Docs: Changed Blank Activity to Basic Activity\" into mnc-io-docs
am:
93dd99c6aa
Change-Id: I28de4c355c23d96ab52a945bfd26567063f25212
Hemal Patel [Mon, 11 Jul 2016 23:22:47 +0000 (23:22 +0000)]
Merge "Docs: Changed Blank Activity to Basic Activity" into mnc-io-docs
Philip P. Moltmann [Mon, 11 Jul 2016 23:22:02 +0000 (23:22 +0000)]
Merge "Set PrintDocumentInfo#mDataSize" into nyc-mr1-dev
Hemal Patel [Mon, 11 Jul 2016 23:21:01 +0000 (23:21 +0000)]
Merge \"Docs: Replaced fill_parent with match_parent\" into mnc-io-docs
am:
1b72b7955d
Change-Id: I8fec574e1501e84f69d9e53b02b0a7537bd3dc16
TreeHugger Robot [Mon, 11 Jul 2016 23:17:40 +0000 (23:17 +0000)]
Merge "Fix docs for DragEvent" into nyc-dev
Hemal Patel [Mon, 11 Jul 2016 23:16:51 +0000 (23:16 +0000)]
Merge "Docs: Replaced fill_parent with match_parent" into mnc-io-docs
Hemal Patel [Fri, 24 Jun 2016 00:11:15 +0000 (17:11 -0700)]
Docs: Replaced fill_parent with match_parent
The value fill_parent is deprecated in API Level 8 and replaced
with match_parent.
Bug:
19432266
Change-Id: Ie91b4de25f1b12ec93c52531785303d683b18d24
Andrew Solovay [Mon, 11 Jul 2016 22:15:40 +0000 (22:15 +0000)]
Merge \\\"docs: Fixing badly formatted {@code} strings\\\" into mnc-io-docs am:
78125ff7cb am:
28528e3c62
am:
f550894eac
Change-Id: If2ffeb50905a7e8a6205cbc643ffcbb3f0b7f44c
Amith Yamasani [Mon, 11 Jul 2016 21:41:01 +0000 (14:41 -0700)]
Include new constant for encryption status in the getter's javadoc
Added a bit more information in the javadocs about the new constant
ENCRYPTION_STATUS_ACTIVE_PER_USER in related methods/constants so
that developers don't miss checking for that constant when targeting
API Level 24.
Change-Id: Id9cd6248637fe0fc28d5161344abe02614b5f502
Fixes:
30073719
Hemal Patel [Fri, 1 Jul 2016 20:33:14 +0000 (13:33 -0700)]
Docs: Changed Blank Activity to Basic Activity
As per Android Studio's latest version, Blank Activity is renamed to
Basic Activity. Hence, fixed step 6 to reflect the change.
Bug:
28177899
Change-Id: I824d60f936975645cd9116e8443771b68e132af9
Andrew Solovay [Mon, 11 Jul 2016 21:58:47 +0000 (21:58 +0000)]
Merge \\"docs: Fixing badly formatted {@code} strings\\" into mnc-io-docs am:
78125ff7cb
am:
28528e3c62
Change-Id: Ie9a21623f1491983aab4cfc624818bb3b8720185
Tyler Gunn [Mon, 11 Jul 2016 21:53:00 +0000 (21:53 +0000)]
Merge "Finalize MEP functionality." into nyc-mr1-dev
Fyodor Kupolov [Mon, 11 Jul 2016 21:51:01 +0000 (21:51 +0000)]
Merge "Schedule backup of a package on a background thread" into nyc-mr1-dev
Andrew Solovay [Mon, 11 Jul 2016 21:48:06 +0000 (21:48 +0000)]
Merge \"docs: Fixing badly formatted {@code} strings\" into mnc-io-docs
am:
78125ff7cb
Change-Id: Id68f9e49225f59e8cb94bcd7ab3905790dc2d223
Fyodor Kupolov [Mon, 11 Jul 2016 21:40:29 +0000 (14:40 -0700)]
Cleanup whole preloads directory
When leaving SUW, cleanup preloads directory, not just demo dir.
Bug:
29908713
Change-Id: Id94e6df619f5ca6585b2a0edb0f1028364431f95
Andrew Solovay [Mon, 11 Jul 2016 21:40:26 +0000 (21:40 +0000)]
Merge "docs: Fixing badly formatted {@code} strings" into mnc-io-docs
OSDN Git Service
