Dianne Hackborn
c0b583d4d6
Merge \\\"Fix issue #29545190 : JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...\\\" into nyc-dev am: a62a7eef24 am: 56197c9e9e
...
am: 2d1788828f
2016-06-22 17:35:40 +00:00
Dianne Hackborn
2d1788828f
Merge \\"Fix issue #29545190 : JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...\\" into nyc-dev am: a62a7eef24
...
am: 56197c9e9e
2016-06-22 17:24:25 +00:00
Dianne Hackborn
56197c9e9e
Merge \"Fix issue #29545190 : JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...\" into nyc-dev
...
am: a62a7eef24
2016-06-22 17:18:38 +00:00
Dianne Hackborn
121e1645d1
Fix issue #29545190 : JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...
...
...isn't respected if previous job was scheduled with same URI
Change-Id: Ib04f6d7cf72e7efc8e84c1a759e91ba520eda139
2016-06-21 20:39:02 -07:00
Antonio Cansado
d3ae6a9c8e
Merge \\\"Fix infinite loop when registering data usage callback.\\\" into nyc-dev am: c20ffc2a9e am: 13cf0e7d54
...
am: 1d4fd3ed27
2016-06-20 22:44:51 +00:00
Antonio Cansado
1d4fd3ed27
Merge \\"Fix infinite loop when registering data usage callback.\\" into nyc-dev am: c20ffc2a9e
...
am: 13cf0e7d54
2016-06-20 22:36:49 +00:00
Antonio Cansado
13cf0e7d54
Merge \"Fix infinite loop when registering data usage callback.\" into nyc-dev
...
am: c20ffc2a9e
2016-06-20 22:29:49 +00:00
Antonio Cansado
c20ffc2a9e
Merge "Fix infinite loop when registering data usage callback." into nyc-dev
2016-06-20 22:23:36 +00:00
Antonio Cansado
f704837429
Fix infinite loop when registering data usage callback.
...
Trivial fix is to call the method that takes the handler as a param.
Bug: 29508547
Change-Id: I75ba30a1663be265eed56b24deda82e83fd47a43
2016-06-20 15:03:03 -07:00
Christopher Tate
4764689d23
Merge \\\"Let bmgr inspect the set of whitelisted transports\\\" into nyc-dev am: 0f101342e1 am: 0754128dc9
...
am: 24c08b27ef
2016-06-20 18:33:17 +00:00
Chris Tate
24c08b27ef
Merge \\"Let bmgr inspect the set of whitelisted transports\\" into nyc-dev am: 0f101342e1
...
am: 0754128dc9
2016-06-20 17:54:15 +00:00
Robin Lee
df51ab6cb2
Remove @return from void API javadoc am: 6918675fa1
...
am: 964aaea69c
2016-06-20 17:49:47 +00:00
Christopher Tate
0754128dc9
Merge \"Let bmgr inspect the set of whitelisted transports\" into nyc-dev
...
am: 0f101342e1
2016-06-20 17:36:58 +00:00
Christopher Tate
abf0d56469
Merge \"Let bmgr inspect the set of whitelisted transports\" into nyc-dev
...
am: 0f101342e1
2016-06-20 17:35:04 +00:00
Robin Lee
964aaea69c
Remove @return from void API javadoc
...
am: 6918675fa1
2016-06-20 17:33:24 +00:00
Robin Lee
8a8a489bbf
Remove @return from void API javadoc
...
am: 6918675fa1
2016-06-20 17:30:34 +00:00
Chris Tate
0f101342e1
Merge "Let bmgr inspect the set of whitelisted transports" into nyc-dev
2016-06-20 17:19:55 +00:00
Robin Lee
6918675fa1
Remove @return from void API javadoc
...
Fix: 29500429
Change-Id: Ieddf211ad881e2e48bf593dcde6d262dd5be6c5c
(cherry picked from commit b3d6b13ad5
2016-06-20 14:53:58 +00:00
Clara Bayarri
e96706141d
Merge "Throw ISE when adding a non-public non-static fragment class instance to a transaction"
2016-06-20 13:11:04 +00:00
Robin Lee
4f5beed66f
Merge "Remove @return from void API javadoc"
2016-06-20 10:54:05 +00:00
Christopher Tate
3a4a018572
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e am: d2a4e1b39c am: 1c3be1a5b1 am: 6b24c84fa2
...
am: 6bf184819c
2016-06-17 21:10:51 +00:00
Christopher Tate
4f7b337cdd
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e am: d2a4e1b39c
...
am: 1c3be1a5b1
2016-06-17 17:09:13 +00:00
Robin Lee
b3d6b13ad5
Remove @return from void API javadoc
...
Change-Id: Ieddf211ad881e2e48bf593dcde6d262dd5be6c5c
2016-06-17 12:54:38 +01:00
Christopher Tate
6bf184819c
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e am: d2a4e1b39c am: 1c3be1a5b1
...
am: 6b24c84fa2
2016-06-17 06:50:28 +00:00
Christopher Tate
6b24c84fa2
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e am: d2a4e1b39c
...
am: 1c3be1a5b1
2016-06-17 00:38:13 +00:00
Christopher Tate
1c3be1a5b1
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e
...
am: d2a4e1b39c
2016-06-17 00:32:26 +00:00
Christopher Tate
d2a4e1b39c
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab
...
am: e2c9b1af3e
2016-06-17 00:24:29 +00:00
Christopher Tate
e2c9b1af3e
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386
...
am: d6c1126fab
2016-06-17 00:18:48 +00:00
Christopher Tate
d6c1126fab
resolve merge conflicts of cffb19c to mnc-dev
...
am: 3f9ea2d386
2016-06-17 00:15:07 +00:00
Christopher Tate
3f9ea2d386
resolve merge conflicts of cffb19c to mnc-dev
...
Change-Id: I4dba574de2678d851e3d82961a07de27d61f5940
2016-06-16 16:31:39 -07:00
Christopher Tate
cffb19c812
Don\\\'t trust callers to supply app info to bindBackupAgent() am: c58054f25f am: cd777e95a7
...
am: ec6c3f7a32
2016-06-16 22:30:17 +00:00
Christopher Tate
cd777e95a7
Don\'t trust callers to supply app info to bindBackupAgent()
...
am: c58054f25f
2016-06-16 22:21:37 +00:00
Clara Bayarri
cd916f24a3
Throw ISE when adding a non-public non-static fragment class instance to a transaction
...
Bug: 25925078
Change-Id: Ifb25a0899fe4f64174a3d37b863481bd238fcce7
2016-06-16 10:59:37 +01:00
Christopher Tate
e227ec61c2
Let bmgr inspect the set of whitelisted transports
...
Needed for compliance testing.
Bug 29072466
Change-Id: I025058ab9197f9e2db062bf0074e79f1cd04b443
2016-06-15 17:40:31 -07:00
Adam Lesinski
02e68a1619
Merge \\\"ResourcesManager: Allow managed addition of library asset paths\\\" into nyc-dev am: 464bda8a2b am: c3ab1b7c0a
...
am: f4152a9c7e
2016-06-15 23:14:51 +00:00
Adam Lesinski
f4152a9c7e
Merge \\"ResourcesManager: Allow managed addition of library asset paths\\" into nyc-dev am: 464bda8a2b
...
am: c3ab1b7c0a
2016-06-15 22:57:08 +00:00
Adam Lesinski
1dda5b39d4
Merge \"ResourcesManager: Allow managed addition of library asset paths\" into nyc-dev
...
am: 464bda8a2b
2016-06-15 22:47:58 +00:00
Adam Lesinski
c3ab1b7c0a
Merge \"ResourcesManager: Allow managed addition of library asset paths\" into nyc-dev
...
am: 464bda8a2b
2016-06-15 22:44:43 +00:00
Adam Lesinski
464bda8a2b
Merge "ResourcesManager: Allow managed addition of library asset paths" into nyc-dev
2016-06-15 22:35:26 +00:00
Alexander Hills
eb4420a985
Merge \\"Adds a flag to Action.WearableExtender to display actions inline on Wear\\" into nyc-mr1-dev am: 7816efa6af
...
am: c295774697
2016-06-15 19:40:19 +00:00
Adam Lesinski
25f48886b2
ResourcesManager: Allow managed addition of library asset paths
...
This allows WebView to add itself to the ResourcesManager and
remain their even after configuration changes and multi-window
changes.
Bug:29112218
Change-Id: I2cb131ae2c61fb58c48babafdd46c1882be96aa9
2016-06-15 12:00:18 -07:00
Aurimas Liutikas
6465299aec
Merge "Clarify Fragment construtor javadoc."
2016-06-15 16:37:39 +00:00
Alex Hills
c295774697
Merge \"Adds a flag to Action.WearableExtender to display actions inline on Wear\" into nyc-mr1-dev
...
am: 7816efa6af
2016-06-15 16:13:52 +00:00
Alexander Hills
7816efa6af
Merge "Adds a flag to Action.WearableExtender to display actions inline on Wear" into nyc-mr1-dev
2016-06-15 16:02:48 +00:00
Aurimas Liutikas
c59422a2c6
Clarify Fragment construtor javadoc.
...
Bug:
https://code.google.com/p/android/issues/detail?id=170497
https://code.google.com/p/android/issues/detail?id=55991
Change-Id: If2309f441bb947f32da60ba7926cc6796e472fdf
2016-06-14 16:50:07 -07:00
TreeHugger Robot
064aa25de3
Merge "Remove TransitionListener after transition completes."
2016-06-14 23:45:47 +00:00
Selim Cinek
a592bdf4ed
Merge \\\"Fixed another case where the systemUI could crashloop\\\" into nyc-dev am: 02ab2f52bf am: 91965ce2e9
...
am: b3e68016e1
2016-06-14 23:24:39 +00:00
Selim Cinek
b3e68016e1
Merge \\"Fixed another case where the systemUI could crashloop\\" into nyc-dev am: 02ab2f52bf
...
am: 91965ce2e9
2016-06-14 23:19:50 +00:00
Selim Cinek
91965ce2e9
Merge \"Fixed another case where the systemUI could crashloop\" into nyc-dev
...
am: 02ab2f52bf
2016-06-14 23:12:12 +00:00
Selim Cinek
24edc3934d
Merge \"Fixed another case where the systemUI could crashloop\" into nyc-dev
...
am: 02ab2f52bf
2016-06-14 23:11:25 +00:00
