OSDN Git Service
Chris Craik [Thu, 16 Jul 2015 22:52:47 +0000 (22:52 +0000)]
Merge "That is not yellow"
Makoto Onuki [Thu, 16 Jul 2015 22:20:17 +0000 (22:20 +0000)]
am
b32039ae: am
c2bf95b0: am
89bcc24b: am
d737ab17: am
b09b84ca: Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev
* commit '
b32039aeba173e87a64e44b5ee47fb6e78fca662':
DefaultPermission: GET_ACCOUNTS is now in CONTACTS
Makoto Onuki [Thu, 16 Jul 2015 22:05:10 +0000 (22:05 +0000)]
am
c2bf95b0: am
89bcc24b: am
d737ab17: am
b09b84ca: Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev
* commit '
c2bf95b04a690685035ab8ae7435a0dd8617c130':
DefaultPermission: GET_ACCOUNTS is now in CONTACTS
Makoto Onuki [Thu, 16 Jul 2015 21:45:26 +0000 (21:45 +0000)]
am
89bcc24b: am
d737ab17: am
b09b84ca: Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev
* commit '
89bcc24b0f59b89d1ba9ae2529af3baa795d79ab':
DefaultPermission: GET_ACCOUNTS is now in CONTACTS
Ying Wang [Thu, 16 Jul 2015 21:36:31 +0000 (21:36 +0000)]
Merge "Using LOCAL_DROIDDOC_STUB_OUT_DIR to specify "-stubs" option."
Makoto Onuki [Thu, 16 Jul 2015 21:30:39 +0000 (21:30 +0000)]
am
d737ab17: am
b09b84ca: Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev
* commit '
d737ab1776d1bb7a3402137bdbf3afffe9860c5a':
DefaultPermission: GET_ACCOUNTS is now in CONTACTS
Ying Wang [Thu, 16 Jul 2015 21:20:22 +0000 (14:20 -0700)]
Using LOCAL_DROIDDOC_STUB_OUT_DIR to specify "-stubs" option.
So that the build system can clean up the stub out dir before
calling doclava.
Bug:
22534021
Change-Id: Iba33cf0a295e4ae32fdcad8bd326c2f52de5f875
Makoto Onuki [Thu, 16 Jul 2015 21:19:33 +0000 (21:19 +0000)]
am
b09b84ca: Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev
* commit '
b09b84cafde5ac31f5ef5c79f7a78db540824471':
DefaultPermission: GET_ACCOUNTS is now in CONTACTS
Makoto Onuki [Thu, 16 Jul 2015 21:01:37 +0000 (21:01 +0000)]
Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev
Chris Craik [Thu, 16 Jul 2015 20:44:26 +0000 (13:44 -0700)]
That is not yellow
Change-Id: I1db4e8c96b128fb84a8ba0b28df34be19608c48a
Svet Ganov [Thu, 16 Jul 2015 20:26:25 +0000 (20:26 +0000)]
am
a73c88db: am
d019bce4: am
e7b7049b: am
f8847c02: am
db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev
* commit '
a73c88dbb843bc8ce5f35782a89fe632c8330572':
Return a result from Fragment#shouldShowRequestPermissionRationale
Svet Ganov [Thu, 16 Jul 2015 20:12:01 +0000 (20:12 +0000)]
am
d019bce4: am
e7b7049b: am
f8847c02: am
db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev
* commit '
d019bce4129b224e638dd4ec235387f85d19e052':
Return a result from Fragment#shouldShowRequestPermissionRationale
Robert Schaub [Thu, 16 Jul 2015 20:11:41 +0000 (20:11 +0000)]
am
a4928832: am
d7335400: am
57cea81f: am
70ab6b79: am
081649c2: am
f4db2de8: am
1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs
* commit '
a49288327401c0a8b35dbe46157b0ac28d6d72c3':
docs: Added "location" before "gps" in list under "Declaring hardware ..."
Chris Craik [Thu, 16 Jul 2015 20:11:02 +0000 (20:11 +0000)]
Merge "Clean up unncessary defines"
Svet Ganov [Thu, 16 Jul 2015 19:57:26 +0000 (19:57 +0000)]
am
e7b7049b: am
f8847c02: am
db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev
* commit '
e7b7049b95fd02b0b4b4f42bb7a8a33d1b3296c4':
Return a result from Fragment#shouldShowRequestPermissionRationale
Robert Schaub [Thu, 16 Jul 2015 19:56:16 +0000 (19:56 +0000)]
am
d7335400: am
57cea81f: am
70ab6b79: am
081649c2: am
f4db2de8: am
1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs
* commit '
d73354007291ad548dbeca0a756e54074aee7828':
docs: Added "location" before "gps" in list under "Declaring hardware ..."
Dianne Hackborn [Thu, 16 Jul 2015 19:49:32 +0000 (19:49 +0000)]
am
953dd1c8: am
02641dfa: am
786946db: am
9e55d57d: am
8983420d: Merge "Don\'t spam the system with unique wake lock names." into mnc-dev
* commit '
953dd1c831030f435034abe458d0b1a2afacded2':
Don't spam the system with unique wake lock names.
Svet Ganov [Thu, 16 Jul 2015 19:42:29 +0000 (19:42 +0000)]
am
f8847c02: am
db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev
* commit '
f8847c02dce2c8ca66d29f8debf120c275b41f09':
Return a result from Fragment#shouldShowRequestPermissionRationale
Robert Schaub [Thu, 16 Jul 2015 19:42:24 +0000 (19:42 +0000)]
am
57cea81f: am
70ab6b79: am
081649c2: am
f4db2de8: am
1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs
* commit '
57cea81f6b82841044c113a05663a4da5b69f355':
docs: Added "location" before "gps" in list under "Declaring hardware ..."
Dianne Hackborn [Thu, 16 Jul 2015 19:35:55 +0000 (19:35 +0000)]
am
02641dfa: am
786946db: am
9e55d57d: am
8983420d: Merge "Don\'t spam the system with unique wake lock names." into mnc-dev
* commit '
02641dfab1d36ac2234a479fc638b6196dc12da4':
Don't spam the system with unique wake lock names.
Robert Schaub [Thu, 16 Jul 2015 19:27:24 +0000 (19:27 +0000)]
am
70ab6b79: am
081649c2: am
f4db2de8: am
1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs
* commit '
70ab6b79147db0894b242cdb597ea5ec9e2d7dac':
docs: Added "location" before "gps" in list under "Declaring hardware ..."
Svet Ganov [Thu, 16 Jul 2015 19:27:18 +0000 (19:27 +0000)]
am
db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev
* commit '
db8fa48ed0864125a07f2bbe078fd60abd875ac7':
Return a result from Fragment#shouldShowRequestPermissionRationale
Todd Kennedy [Thu, 16 Jul 2015 19:21:25 +0000 (19:21 +0000)]
am
c0036d03: am
48869114: am
a6a5ba19: am
c84bf849: am
a4911ed9: Merge "Verfiy global apps with device owner" into mnc-dev
* commit '
c0036d03a47ebe0eadee68a9db31e86d88153422':
Verfiy global apps with device owner
Miao Wang [Thu, 16 Jul 2015 19:21:14 +0000 (19:21 +0000)]
Wale Ogunwale [Thu, 16 Jul 2015 19:21:03 +0000 (19:21 +0000)]
am
69b301ec: am
bc72debf: am
40d16bd0: am
fd2a5f14: am
11813232: Merge "Animate app exit for cases where the app is already hidden before transition" into mnc-dev
* commit '
69b301ec55db3c87f8e53629f3777ecdc31fd3b5':
Animate app exit for cases where the app is already hidden before transition
John Reck [Thu, 16 Jul 2015 19:20:46 +0000 (19:20 +0000)]
am
be7e2a47: am
599287b1: am
b4d49a4d: am
d5612d06: am
ba4f0757: Merge "Don\'t crash on makeCurrent fail" into mnc-dev
* commit '
be7e2a476fd8f3e25710a96a391a2d9ca2ddad99':
Don't crash on makeCurrent fail
Dianne Hackborn [Thu, 16 Jul 2015 19:19:57 +0000 (19:19 +0000)]
am
786946db: am
9e55d57d: am
8983420d: Merge "Don\'t spam the system with unique wake lock names." into mnc-dev
* commit '
786946db0b62aa7eb347337e1e34247bb0c15865':
Don't spam the system with unique wake lock names.
Svet Ganov [Thu, 16 Jul 2015 19:16:54 +0000 (19:16 +0000)]
Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev
Robert Schaub [Thu, 16 Jul 2015 19:10:48 +0000 (19:10 +0000)]
am
081649c2: am
f4db2de8: am
1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs
* commit '
081649c2b5ffc1d9ea7a389cc9687659544a535e':
docs: Added "location" before "gps" in list under "Declaring hardware ..."
Dianne Hackborn [Thu, 16 Jul 2015 19:04:26 +0000 (19:04 +0000)]
am
9e55d57d: am
8983420d: Merge "Don\'t spam the system with unique wake lock names." into mnc-dev
* commit '
9e55d57dc7fccbeae4bb8ff4be322d7e2b87dacc':
Don't spam the system with unique wake lock names.
Robert Schaub [Thu, 16 Jul 2015 18:57:39 +0000 (18:57 +0000)]
am
f4db2de8: am
1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs
* commit '
f4db2de881d197db0dfd76645dfd7a95b1f8f0de':
docs: Added "location" before "gps" in list under "Declaring hardware ..."
Todd Kennedy [Thu, 16 Jul 2015 18:56:03 +0000 (18:56 +0000)]
am
48869114: am
a6a5ba19: am
c84bf849: am
a4911ed9: Merge "Verfiy global apps with device owner" into mnc-dev
* commit '
488691144f981943dfe717b47108a2dc76075397':
Verfiy global apps with device owner
Dianne Hackborn [Thu, 16 Jul 2015 18:45:37 +0000 (18:45 +0000)]
am
8983420d: Merge "Don\'t spam the system with unique wake lock names." into mnc-dev
* commit '
8983420d30d3e962c519d7f9a5d8b8ea4bc3f42c':
Don't spam the system with unique wake lock names.
Robert Schaub [Thu, 16 Jul 2015 18:40:37 +0000 (18:40 +0000)]
am
1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs
* commit '
1b29a95789c29174d5e4d526f6449c2c354ef3b3':
docs: Added "location" before "gps" in list under "Declaring hardware ..."
Todd Kennedy [Thu, 16 Jul 2015 18:38:14 +0000 (18:38 +0000)]
am
a6a5ba19: am
c84bf849: am
a4911ed9: Merge "Verfiy global apps with device owner" into mnc-dev
* commit '
a6a5ba19279b6a1e3af22ad7a266341ad6ff1652':
Verfiy global apps with device owner
Makoto Onuki [Thu, 16 Jul 2015 18:38:00 +0000 (11:38 -0700)]
DefaultPermission: GET_ACCOUNTS is now in CONTACTS
Bug
22532312
Change-Id: If7ad0faa3a196bb28da1ddc13788c0430df1d1ee
Dianne Hackborn [Thu, 16 Jul 2015 18:31:14 +0000 (18:31 +0000)]
Merge "Don't spam the system with unique wake lock names." into mnc-dev
Miao Wang [Thu, 16 Jul 2015 18:28:45 +0000 (18:28 +0000)]
am
d96243a1: am
10653cef: Merge "fix BNNM docs"
* commit '
d96243a1d7b2ce660b256694cd465b240e7413f1':
fix BNNM docs
Todd Kennedy [Thu, 16 Jul 2015 18:21:54 +0000 (18:21 +0000)]
am
c84bf849: am
a4911ed9: Merge "Verfiy global apps with device owner" into mnc-dev
* commit '
c84bf8498e51b04f8be5bfea0616a4bc0bc81eee':
Verfiy global apps with device owner
Robert Schaub [Thu, 16 Jul 2015 18:21:19 +0000 (18:21 +0000)]
Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs
Miao Wang [Thu, 16 Jul 2015 18:13:51 +0000 (18:13 +0000)]
am
10653cef: Merge "fix BNNM docs"
* commit '
10653cef2ae7eb6e1dff1063ddde24347c350bae':
fix BNNM docs
Todd Kennedy [Thu, 16 Jul 2015 18:09:51 +0000 (18:09 +0000)]
am
a4911ed9: Merge "Verfiy global apps with device owner" into mnc-dev
* commit '
a4911ed97102b638a373adcdae7e4c9b3c64cc30':
Verfiy global apps with device owner
Miao Wang [Thu, 16 Jul 2015 18:00:01 +0000 (18:00 +0000)]
Merge "fix BNNM docs"
Todd Kennedy [Thu, 16 Jul 2015 17:59:32 +0000 (17:59 +0000)]
Merge "Verfiy global apps with device owner" into mnc-dev
Wale Ogunwale [Thu, 16 Jul 2015 17:56:17 +0000 (17:56 +0000)]
am
bc72debf: am
40d16bd0: am
fd2a5f14: am
11813232: Merge "Animate app exit for cases where the app is already hidden before transition" into mnc-dev
* commit '
bc72debf36247919a4c9d754f4057ca6ae038454':
Animate app exit for cases where the app is already hidden before transition
John Reck [Thu, 16 Jul 2015 17:43:53 +0000 (17:43 +0000)]
am
599287b1: am
b4d49a4d: am
d5612d06: am
ba4f0757: Merge "Don\'t crash on makeCurrent fail" into mnc-dev
* commit '
599287b14d32bbe6b5eea4e610cc14d8224362b6':
Don't crash on makeCurrent fail
Wale Ogunwale [Thu, 16 Jul 2015 17:43:34 +0000 (17:43 +0000)]
am
40d16bd0: am
fd2a5f14: am
11813232: Merge "Animate app exit for cases where the app is already hidden before transition" into mnc-dev
* commit '
40d16bd07cf9bdf5fffd80ef7c2f5b18b245c51a':
Animate app exit for cases where the app is already hidden before transition
Wale Ogunwale [Thu, 16 Jul 2015 17:30:42 +0000 (17:30 +0000)]
am
fd2a5f14: am
11813232: Merge "Animate app exit for cases where the app is already hidden before transition" into mnc-dev
* commit '
fd2a5f14859c8ed78ccb0b2138cb7e6cb3a908c3':
Animate app exit for cases where the app is already hidden before transition
John Reck [Thu, 16 Jul 2015 17:29:29 +0000 (17:29 +0000)]
am
b4d49a4d: am
d5612d06: am
ba4f0757: Merge "Don\'t crash on makeCurrent fail" into mnc-dev
* commit '
b4d49a4d39d123058c49463d2f76860bce77b219':
Don't crash on makeCurrent fail
Miao Wang [Wed, 15 Jul 2015 18:35:28 +0000 (11:35 -0700)]
fix BNNM docs
bug:
22507076
Change-Id: I5fdffdde597d97b1dde77574d096b81bff4aa382
(cherry picked from commit
d7d413ad0bfaea2d4bb4adcd8011239c2f5f74ae)
Tony Mak [Thu, 16 Jul 2015 17:18:02 +0000 (17:18 +0000)]
am
de0fa318: am
364c8065: am
5eea2455: am
245466b5: am
532737df: Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev
* commit '
de0fa318fb3d7e7634e5b86c2edf244ba5fdb52d':
Fix calendar reminder notification is not shown in idle state
George Mount [Thu, 16 Jul 2015 17:17:54 +0000 (17:17 +0000)]
am
5ee9088a: am
d3682f6d: am
aa476de5: am
2456f77c: am
bd87b6b5: Merge "Make additional shared elements a version-checked feature." into mnc-dev
* commit '
5ee9088a33109752ecfdfef2e9413386adee08a7':
Make additional shared elements a version-checked feature.
George Mount [Thu, 16 Jul 2015 17:17:47 +0000 (17:17 +0000)]
am
a97d513b: am
a38c0004: am
bf6430a0: am
3d520403: am
30c8245a: Merge "Add data binding to built javadoc." into mnc-dev
* commit '
a97d513ba2068e76755ccf773c748399fd1695a7':
Add data binding to built javadoc.
Nicolas Prevot [Thu, 16 Jul 2015 17:17:23 +0000 (17:17 +0000)]
am
73c489a9: am
e31dad2b: am
e4036947: am
b298ba48: am
dbdf7c45: Don\'t send app links to the parent if status = never (part 2)
* commit '
73c489a9b3045b044ca6d670762bee64ce8f6044':
Don't send app links to the parent if status = never (part 2)
Neil Fuller [Thu, 16 Jul 2015 17:17:15 +0000 (17:17 +0000)]
am
d3f9858d: am
98f3d953: am
eccbc7c9: Merge "Fix NativeCrashListener"
* commit '
d3f9858d65633dbba488250f5bc808bbbc44c372':
Fix NativeCrashListener
Narayan Kamath [Thu, 16 Jul 2015 17:16:57 +0000 (17:16 +0000)]
am
a82152aa: am
737106a6: am
1ecfdf33: Merge "docs: Add an explicit dependency on libcore/Docs.mk"
* commit '
a82152aaf49b893ad11e6ecdb1fafbef12add586':
docs: Add an explicit dependency on libcore/Docs.mk
Wale Ogunwale [Thu, 16 Jul 2015 17:16:10 +0000 (17:16 +0000)]
am
11813232: Merge "Animate app exit for cases where the app is already hidden before transition" into mnc-dev
* commit '
1181323230478e3027bbabbbaf769dcd4a11a0e4':
Animate app exit for cases where the app is already hidden before transition
John Reck [Thu, 16 Jul 2015 17:16:01 +0000 (17:16 +0000)]
am
d5612d06: am
ba4f0757: Merge "Don\'t crash on makeCurrent fail" into mnc-dev
* commit '
d5612d06c46e0a3e2d1b55cc4288ea6759b96a94':
Don't crash on makeCurrent fail
John Reck [Thu, 16 Jul 2015 17:01:22 +0000 (17:01 +0000)]
am
ba4f0757: Merge "Don\'t crash on makeCurrent fail" into mnc-dev
* commit '
ba4f0757779d6e91e52ebee0fd4c847b673a69e2':
Don't crash on makeCurrent fail
Wale Ogunwale [Thu, 16 Jul 2015 17:00:58 +0000 (17:00 +0000)]
Merge "Animate app exit for cases where the app is already hidden before transition" into mnc-dev
Svet Ganov [Thu, 16 Jul 2015 16:58:38 +0000 (09:58 -0700)]
Return a result from Fragment#shouldShowRequestPermissionRationale
bug:
22523342
Change-Id: Ibacedec952316db705c57204fa448dbcada1c3e6
John Reck [Thu, 16 Jul 2015 16:50:28 +0000 (16:50 +0000)]
Merge "Don't crash on makeCurrent fail" into mnc-dev
Wale Ogunwale [Thu, 16 Jul 2015 16:45:35 +0000 (09:45 -0700)]
Animate app exit for cases where the app is already hidden before transition
It is possible for an app token to be marked as hidden and exiting
because the previous activity destory is completed before we are
good-to-go with app transition since we are still waiting for the
opening app to be done drawing. In this case we don't apply the
exiting animation since the token is not changing visibility state
during the app transition (it is already hidden and we are telling
it to hide...).
We now allow the animation to load if the token is already hidden
and marked as exiting.
Bug:
22381703
Change-Id: I5c27b6c3c1f810f05b2d716122055c6f12d0a167
Todd Kennedy [Thu, 16 Jul 2015 16:44:31 +0000 (09:44 -0700)]
Verfiy global apps with device owner
Applications installed for a specific user must be verfied as that user. However,
apps that are installed globally [i.e. UserHandle.ALL] should not be verified by
every user on the device. Instead, they should be verified by the device owner.
Bug:
21901423
Change-Id: I5fd3f690d08e7e911a3c86f09bbfcd4eb635b418
Xiaohui Chen [Thu, 16 Jul 2015 16:39:35 +0000 (16:39 +0000)]
Merge "sys user split: turn off unlocking for sys user."
Xiaohui Chen [Thu, 16 Jul 2015 16:36:09 +0000 (16:36 +0000)]
Merge "sys user split: assign admin/primary flag"
Xiaohui Chen [Thu, 16 Jul 2015 16:30:17 +0000 (16:30 +0000)]
Merge "sys user split: refactor systemui user switcher"
John Reck [Thu, 16 Jul 2015 16:17:59 +0000 (09:17 -0700)]
Don't crash on makeCurrent fail
Bug:
22444755
WindowManager may decide to yank the surface at any point, so
attempt to kinda handle this
Change-Id: Id2f665d2f0f93bccd4ec977fbf52dca4dc1ec891
Tony Mak [Thu, 16 Jul 2015 15:43:56 +0000 (15:43 +0000)]
am
364c8065: am
5eea2455: am
245466b5: am
532737df: Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev
* commit '
364c80657b8d70b1606845a987995b21e4f857b2':
Fix calendar reminder notification is not shown in idle state
Tony Mak [Thu, 16 Jul 2015 15:31:08 +0000 (15:31 +0000)]
am
5eea2455: am
245466b5: am
532737df: Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev
* commit '
5eea245598e17f81817c7ddc19e846740f6187e9':
Fix calendar reminder notification is not shown in idle state
Tony Mak [Thu, 16 Jul 2015 15:15:32 +0000 (15:15 +0000)]
am
245466b5: am
532737df: Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev
* commit '
245466b5734546264b0492455fd2f6dc135daf39':
Fix calendar reminder notification is not shown in idle state
George Mount [Thu, 16 Jul 2015 15:09:51 +0000 (15:09 +0000)]
am
d3682f6d: am
aa476de5: am
2456f77c: am
bd87b6b5: Merge "Make additional shared elements a version-checked feature." into mnc-dev
* commit '
d3682f6da6550c1a63ab62d5be0bb8622acd05d6':
Make additional shared elements a version-checked feature.
George Mount [Thu, 16 Jul 2015 15:09:45 +0000 (15:09 +0000)]
am
a38c0004: am
bf6430a0: am
3d520403: am
30c8245a: Merge "Add data binding to built javadoc." into mnc-dev
* commit '
a38c00048e5f90e90dbad115d280f7e8a2dffe18':
Add data binding to built javadoc.
Tony Mak [Thu, 16 Jul 2015 15:03:56 +0000 (15:03 +0000)]
am
532737df: Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev
* commit '
532737df65330200dc55ae42d31140d19c4024be':
Fix calendar reminder notification is not shown in idle state
George Mount [Thu, 16 Jul 2015 14:56:11 +0000 (14:56 +0000)]
am
aa476de5: am
2456f77c: am
bd87b6b5: Merge "Make additional shared elements a version-checked feature." into mnc-dev
* commit '
aa476de57501aa57ee04b106ccdae03ca476cf91':
Make additional shared elements a version-checked feature.
George Mount [Thu, 16 Jul 2015 14:56:05 +0000 (14:56 +0000)]
am
bf6430a0: am
3d520403: am
30c8245a: Merge "Add data binding to built javadoc." into mnc-dev
* commit '
bf6430a0f3545ed73c33c77d7b1c4c1791e65bf3':
Add data binding to built javadoc.
Tony Mak [Thu, 16 Jul 2015 14:50:16 +0000 (14:50 +0000)]
Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev
George Mount [Thu, 16 Jul 2015 14:42:29 +0000 (14:42 +0000)]
am
2456f77c: am
bd87b6b5: Merge "Make additional shared elements a version-checked feature." into mnc-dev
* commit '
2456f77c3f3ab001ac20cd7d8ee099c14f98271f':
Make additional shared elements a version-checked feature.
George Mount [Thu, 16 Jul 2015 14:42:25 +0000 (14:42 +0000)]
am
3d520403: am
30c8245a: Merge "Add data binding to built javadoc." into mnc-dev
* commit '
3d52040359721934231e0e89d45b3bd4179db475':
Add data binding to built javadoc.
George Mount [Thu, 16 Jul 2015 14:29:42 +0000 (14:29 +0000)]
am
bd87b6b5: Merge "Make additional shared elements a version-checked feature." into mnc-dev
* commit '
bd87b6b5b0c478c45d0dd5725cbc59995e751c64':
Make additional shared elements a version-checked feature.
George Mount [Thu, 16 Jul 2015 14:29:38 +0000 (14:29 +0000)]
am
30c8245a: Merge "Add data binding to built javadoc." into mnc-dev
* commit '
30c8245afc8d9558b76e5c86f917c22e02f6e820':
Add data binding to built javadoc.
George Mount [Thu, 16 Jul 2015 14:24:06 +0000 (14:24 +0000)]
Merge "Make additional shared elements a version-checked feature." into mnc-dev
George Mount [Thu, 16 Jul 2015 14:19:08 +0000 (14:19 +0000)]
Merge "Add data binding to built javadoc." into mnc-dev
George Mount [Wed, 15 Jul 2015 23:30:20 +0000 (16:30 -0700)]
Make additional shared elements a version-checked feature.
Bug
22505481
ag/684544 added a feature to allow shared elements that weren't
shared into an Activity to be shared back. However, if you are
targeting an older version of the SDK, you may get an unexpected
shared element back. This change in behavior has been locked
behind a target version check.
Change-Id: I7162e24f3b14fedd6b308e89e9d04ac67660f7d6
Nicolas Prevot [Thu, 16 Jul 2015 11:48:40 +0000 (11:48 +0000)]
am
e31dad2b: am
e4036947: am
b298ba48: am
dbdf7c45: Don\'t send app links to the parent if status = never (part 2)
* commit '
e31dad2bdef4ac4e285a3239dbff3a234bc08e8f':
Don't send app links to the parent if status = never (part 2)
Nicolas Prevot [Thu, 16 Jul 2015 11:35:42 +0000 (11:35 +0000)]
am
e4036947: am
b298ba48: am
dbdf7c45: Don\'t send app links to the parent if status = never (part 2)
* commit '
e40369476de9d61d36ebf5d743b66b09e0bfb24c':
Don't send app links to the parent if status = never (part 2)
Nicolas Prevot [Thu, 16 Jul 2015 11:21:32 +0000 (11:21 +0000)]
am
b298ba48: am
dbdf7c45: Don\'t send app links to the parent if status = never (part 2)
* commit '
b298ba48275fb36390398afbe196cc1ef7dae762':
Don't send app links to the parent if status = never (part 2)
Nicolas Prevot [Thu, 16 Jul 2015 11:12:30 +0000 (11:12 +0000)]
am
dbdf7c45: Don\'t send app links to the parent if status = never (part 2)
* commit '
dbdf7c45380f7701e029a279932d2c97bf55fdc9':
Don't send app links to the parent if status = never (part 2)
Neil Fuller [Thu, 16 Jul 2015 10:59:04 +0000 (10:59 +0000)]
am
98f3d953: am
eccbc7c9: Merge "Fix NativeCrashListener"
* commit '
98f3d95397a6213917171e1a03dc39719ece08ee':
Fix NativeCrashListener
Neil Fuller [Thu, 16 Jul 2015 10:42:05 +0000 (10:42 +0000)]
am
eccbc7c9: Merge "Fix NativeCrashListener"
* commit '
eccbc7c96f3f3dfa82f25362cf4ed0db3d9a6cb6':
Fix NativeCrashListener
Neil Fuller [Thu, 16 Jul 2015 10:26:17 +0000 (10:26 +0000)]
Merge "Fix NativeCrashListener"
Narayan Kamath [Thu, 16 Jul 2015 10:26:16 +0000 (10:26 +0000)]
am
737106a6: am
1ecfdf33: Merge "docs: Add an explicit dependency on libcore/Docs.mk"
* commit '
737106a61b0ceb2a6b92e7734b04900b174addce':
docs: Add an explicit dependency on libcore/Docs.mk
Narayan Kamath [Thu, 16 Jul 2015 10:10:28 +0000 (10:10 +0000)]
am
1ecfdf33: Merge "docs: Add an explicit dependency on libcore/Docs.mk"
* commit '
1ecfdf33ee593c0e80cee5e11f4c0a0fd0071233':
docs: Add an explicit dependency on libcore/Docs.mk
Vineeta Srivastava [Thu, 16 Jul 2015 10:09:18 +0000 (10:09 +0000)]
am
dbc00249: am
ac11497e: am
1bc7df4f: am
1099ad41: am
47e04090: Merge "Remove redundant cancel events from FingerprintService" into mnc-dev
* commit '
dbc002497775447e600c26e91cf7b744127f4f93':
Remove redundant cancel events from FingerprintService
Nicolas Prevot [Wed, 15 Jul 2015 13:54:45 +0000 (14:54 +0100)]
Don't send app links to the parent if status = never (part 2)
To qualify for cross-profile app linking, an intent should resolve
with a better status than "NEVER". Moved this check from canForwardTo
into the source method, getCrossProfileDomainPreferredLpr, to stop
bad resolutions leaking out.
BUG:
22287521
Change-Id: I195979d78a783864d841a81f358780912bbf168e
Narayan Kamath [Thu, 16 Jul 2015 08:57:17 +0000 (08:57 +0000)]
Merge "docs: Add an explicit dependency on libcore/Docs.mk"
Narayan Kamath [Tue, 14 Jul 2015 12:39:23 +0000 (13:39 +0100)]
docs: Add an explicit dependency on libcore/Docs.mk
We include libcore sources in apicheck / docs targets so we must
regenerate the stubs or api definitions whenever the list of libcore
sources changes.
Change-Id: I9383015069bc4064d5d06d3d540047cd408e24c7
Vineeta Srivastava [Thu, 16 Jul 2015 07:57:02 +0000 (07:57 +0000)]
am
ac11497e: am
1bc7df4f: am
1099ad41: am
47e04090: Merge "Remove redundant cancel events from FingerprintService" into mnc-dev
* commit '
ac11497e226bc6f02110df241a85608a1d73015c':
Remove redundant cancel events from FingerprintService
Vineeta Srivastava [Thu, 16 Jul 2015 07:43:44 +0000 (07:43 +0000)]
am
1bc7df4f: am
1099ad41: am
47e04090: Merge "Remove redundant cancel events from FingerprintService" into mnc-dev
* commit '
1bc7df4f3b08c57ee0068338617d7f7284a2fc5e':
Remove redundant cancel events from FingerprintService
Vineeta Srivastava [Thu, 16 Jul 2015 07:30:38 +0000 (07:30 +0000)]
am
1099ad41: am
47e04090: Merge "Remove redundant cancel events from FingerprintService" into mnc-dev
* commit '
1099ad41e315f5e2b3638d39a1698472d61ea302':
Remove redundant cancel events from FingerprintService
OSDN Git Service
